From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966221AbbKFRi7 (ORCPT ); Fri, 6 Nov 2015 12:38:59 -0500 Received: from mout.web.de ([212.227.17.12]:54852 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932340AbbKFRi4 (ORCPT ); Fri, 6 Nov 2015 12:38:56 -0500 Subject: [PATCH] iommu/arm-smmu: Delete an unnecessary check before free_io_pgtable_ops() To: =?UTF-8?B?SsO2cmcgUsO2ZGVs?= , Will Deacon , linux-arm-kernel@lists.infradead.org, iommu@lists.linux-foundation.org References: <5307CAA2.8060406@users.sourceforge.net> <530A086E.8010901@users.sourceforge.net> <530A72AA.3000601@users.sourceforge.net> <530B5FB6.6010207@users.sourceforge.net> <530C5E18.1020800@users.sourceforge.net> <530CD2C4.4050903@users.sourceforge.net> <530CF8FF.8080600@users.sourceforge.net> <530DD06F.4090703@users.sourceforge.net> <5317A59D.4@users.sourceforge.net> <558FFF19.1060402@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <563CE58B.4050802@users.sourceforge.net> Date: Fri, 6 Nov 2015 18:38:19 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-Version: 1.0 In-Reply-To: <558FFF19.1060402@users.sourceforge.net> Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:h69g4+1mZlL7jwq347IbQgvQyYPTempKMqDpsza9DAF9aVy8dPM pyXEpjKhhsBuX5slcs3Y5i16q8f/vQ27kniDQTvqdnDcAM2gl1ddIoG7sCCRvePwq06Fv+Q eZRQmWxVrcKeBkBNs/NZzVQZB/2unqxnmoQEc+xmXVrNvS0Ifr/A3rv6EOxKFM1KvDjCHoo 0XksjXYkK6HPrSaGSmqeQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:JWUKRYWb+c4=:cvgUYSsKrFBTAuSVCteCxn rP3PVcTlTv6lMhq7wSCZokjlMm78d3fRMNuVljkVF34jTth21Vc5Q4izeEgp+HKSriTQD+iJS 6fBjUR4oNLpRkwPwFWhDeWo9SoPgPVz7kw84N82t4k6VChHw5CRAMNBdkmsmrSyesTPUilgt1 cauEjoe1531Ih5t04y+OvPzot2BxpGqhj1o/KgLY6rP39UugTCjfa7uFdZL1jtF46QgS4B0Ye P7tEHVnng+/iL/pyUnFAq/PDd0Ffl+Y3eMnydsHllDFTUD9stIQXnQj8aK/OjtS+UKu4GAuPu zvH9bJ7zySgfbjREQpV7CZeuNy/OZcl1cLY0WysVa2x6IcG+gt5doxeVcLGRlhVP71a9DBHYs HrG2BMGlWESF93yJYfOvCIeI5yP2sLs35p7jy8q+1Cf/m8i22NcH6mLROX0ERMHUJGIrZldHj E2kqlVqZKLqH2B6bogAqFojrhMJk0ZPvAfaue+cVR42usAGNFmJeZgBtMI+tvqNAWKQ9VOMhJ bxNO5oL2olz6+Q2ORhpEpOQbALlJpVAiaq+9f5r03CpVwVBeI5RZ6f+iLOj3PhlsyJHSm/i65 Eug/xtXcOUvpobTQAPdigU4t4NbYrfD4nAFefz+3Ce7gBdx8KKjJ5cObfhcQMyC382m/3yEwK bCsHRwhPV8aWddnNzHqn7+Kk8tNvSss5KQEzzXSvTOINwpHpcb+MyBbM4+2g3aVQ/T6pnyoak SMYhscoBKyTDu4ZgVCQYokVPlMzsZYxZYvadx/qzUtLIGGwbZ2tWVzVgpmqsTdGOaLJg4BQAO F0KI2pi Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Fri, 6 Nov 2015 18:32:41 +0100 The free_io_pgtable_ops() function tests whether its argument is NULL and then returns immediately. Thus the test around the call is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/iommu/arm-smmu.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c index 47dc7a7..1ce4b85 100644 --- a/drivers/iommu/arm-smmu.c +++ b/drivers/iommu/arm-smmu.c @@ -945,9 +945,7 @@ static void arm_smmu_destroy_domain_context(struct iommu_domain *domain) free_irq(irq, domain); } - if (smmu_domain->pgtbl_ops) - free_io_pgtable_ops(smmu_domain->pgtbl_ops); - + free_io_pgtable_ops(smmu_domain->pgtbl_ops); __arm_smmu_free_bitmap(smmu->context_map, cfg->cbndx); } -- 2.6.2