From patchwork Fri Jun 29 06:15:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hiroshi Doyu X-Patchwork-Id: 167987 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 7331D1007D4 for ; Fri, 29 Jun 2012 16:15:50 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751257Ab2F2GPt (ORCPT ); Fri, 29 Jun 2012 02:15:49 -0400 Received: from hqemgate04.nvidia.com ([216.228.121.35]:10524 "EHLO hqemgate04.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751007Ab2F2GPs (ORCPT ); Fri, 29 Jun 2012 02:15:48 -0400 Received: from hqnvupgp08.nvidia.com (Not Verified[216.228.121.13]) by hqemgate04.nvidia.com id ; Thu, 28 Jun 2012 23:15:01 -0700 Received: from hqemhub01.nvidia.com ([172.17.108.22]) by hqnvupgp08.nvidia.com (PGP Universal service); Thu, 28 Jun 2012 23:15:47 -0700 X-PGP-Universal: processed; by hqnvupgp08.nvidia.com on Thu, 28 Jun 2012 23:15:47 -0700 Received: from hqnvemgw02.nvidia.com (172.16.227.111) by hqemhub01.nvidia.com (172.20.150.30) with Microsoft SMTP Server id 8.3.264.0; Thu, 28 Jun 2012 23:15:47 -0700 Received: from thelma.nvidia.com (Not Verified[172.16.212.77]) by hqnvemgw02.nvidia.com with MailMarshal (v6,7,2,8378) id ; Thu, 28 Jun 2012 23:15:56 -0700 Received: from oreo.Nvidia.com (dhcp-10-21-25-186.nvidia.com [10.21.25.186]) by thelma.nvidia.com (8.13.8+Sun/8.8.8) with ESMTP id q5T6Fj1v019583; Thu, 28 Jun 2012 23:15:45 -0700 (PDT) From: Hiroshi DOYU To: CC: , Hiroshi DOYU , Stephen Warren Subject: [v3 1/2] iommu/tegra: smmu: Remove unnecessary sanity check at alloc_pdir() Date: Fri, 29 Jun 2012 09:15:26 +0300 Message-ID: <1340950527-16482-1-git-send-email-hdoyu@nvidia.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <20120628.221945.1306825810095951985.hdoyu@nvidia.com> References: <20120628.221945.1306825810095951985.hdoyu@nvidia.com> MIME-Version: 1.0 Sender: linux-tegra-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-tegra@vger.kernel.org alloc_pdir() is called with smmu->as[?].pdir_page == NULL. No need to check pdir_page again inside alloc_pdir(). Signed-off-by: Hiroshi DOYU Cc: Stephen Warren Acked-by: Stephen Warren --- drivers/iommu/tegra-smmu.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/drivers/iommu/tegra-smmu.c b/drivers/iommu/tegra-smmu.c index ecd6790..532c8a4 100644 --- a/drivers/iommu/tegra-smmu.c +++ b/drivers/iommu/tegra-smmu.c @@ -546,9 +546,6 @@ static int alloc_pdir(struct smmu_as *as) u32 val; struct smmu_device *smmu = as->smmu; - if (as->pdir_page) - return 0; - as->pte_count = devm_kzalloc(smmu->dev, sizeof(as->pte_count[0]) * SMMU_PDIR_COUNT, GFP_KERNEL); if (!as->pte_count) {