From patchwork Thu Nov 5 16:17:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 540504 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 6C469140D8E for ; Fri, 6 Nov 2015 03:19:42 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1161670AbbKEQTW (ORCPT ); Thu, 5 Nov 2015 11:19:22 -0500 Received: from mout.web.de ([212.227.15.4]:59537 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1162138AbbKEQRx (ORCPT ); Thu, 5 Nov 2015 11:17:53 -0500 Received: from [192.168.1.2] ([78.49.111.82]) by smtp.web.de (mrweb004) with ESMTPSA (Nemesis) id 0MRRay-1a15LZ1ezA-00Sd1P; Thu, 05 Nov 2015 17:17:17 +0100 Subject: [PATCH] pinctrl: Delete unnecessary checks before the function call "pinctrl_unregister" 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> To: Jon Mason , Linus Walleij , Ray Jui , Scott Branden , linux-gpio@vger.kernel.org, linux-arm-kernel@lists.infradead.org, bcm-kernel-feedback-list@broadcom.com Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <563B810B.6050401@users.sourceforge.net> Date: Thu, 5 Nov 2015 17:17:15 +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: <5317A59D.4@users.sourceforge.net> X-Provags-ID: V03:K0:3eZog2KKQ1qZxp1Aqa28zP62CSiaRiSLh1uPlvAxbKHZn9SkeAA WhjSh0UUKfhmdxcdEQTDn7qPpbluQWJJHfFitfYOaqorQ3hnrUo0o9V2//4AUuYlEC5XBYd WnqE7vOW6kw2l/pjbeH9v5W6EmiMqN7xF1CQc2fKjW+uu3zy8+/TNYPwZVgWn9Otuyr1kMz VSxyMHEf2mTWyoFONTsKA== X-UI-Out-Filterresults: notjunk:1; V01:K0:30qRHhTqanw=:6ymvMcPz0QoifTbYhoBUdv hgtXbMjwdndr2abRPhg0/DrmSk2+7GefHulPP6DJKmrYj6MBK4tpZsq9h9roJ2TUCoBjemtSe DXjtfekHx7S9gTvgxJxVoSfHRtqlfd30xp/NRk5Cyc60fDS00xUFqNm2XhwjJSXHwgJjBkJ6+ UMohVDnu5fkUnL7sENb0G6M0xs/Klvab5BjFgbsMoolwgpKGM3OODaiaw1Y9oXZhSIiT77PwF 5M3tZKFlroA0XcV1KMt4eOY3h4Kszm711V/gE1Z1PkSiIXkPGXiMFlVCxQEJw1eKjU72V5vid MVjDk/6ehW0gpKrnT2wbcb91awV/rgGmdQa4BQgNdKf77wL5Hc1vtGag4JYbuFyHzyPD/62p8 wLpVEIfDuWnkOp0E7H5T77mk3ik0jGeLDBJEf/v1UQb9P7iJJDay8RWy40z/SWaXcyiiOb3hl 1syzLpfCDoJW0Yyw70h4tpg52/21vHeM1NtArTKv5jQsaYxP2P2k5QyfrgxS3fI0zBD1lpyqR 1qR2TTVI2NEgm10EdCFKliQWR6w429goYSsq6ZSyLQzguJMAURjNsG2flp2dgeyE5udI8HllT LnS3+7GlnQlmipQd6bx6F+jOrUiItoz54Ya3eQZ/N4+jm+lwXkYfpaBHR0GfJ28WlPjuVz2IO IfweT6G7+qH+uYsizo7/gBAD53Y8AofMs5gGPwl054MqwSyGnpM8yMGhC9TBcD9Z8ThUcVh83 03jBlnGScWa9CLni0MY5q2veszc+1JGBb665rrSoTcM6V+vY+ZLTBcF7NW1O2mDuJ90sya0d6 p1tNKCH Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org From: Markus Elfring Date: Thu, 5 Nov 2015 17:10:22 +0100 The pinctrl_unregister() 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 Reviewed-by: Ray Jui --- drivers/pinctrl/bcm/pinctrl-cygnus-gpio.c | 3 +-- drivers/pinctrl/pinctrl-single.c | 5 +---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/pinctrl/bcm/pinctrl-cygnus-gpio.c b/drivers/pinctrl/bcm/pinctrl-cygnus-gpio.c index 12a48f4..663ad0a 100644 --- a/drivers/pinctrl/bcm/pinctrl-cygnus-gpio.c +++ b/drivers/pinctrl/bcm/pinctrl-cygnus-gpio.c @@ -638,8 +638,7 @@ static int cygnus_gpio_register_pinconf(struct cygnus_gpio *chip) static void cygnus_gpio_unregister_pinconf(struct cygnus_gpio *chip) { - if (chip->pctl) - pinctrl_unregister(chip->pctl); + pinctrl_unregister(chip->pctl); } struct cygnus_gpio_data { diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c index ef04b96..d24e5f1 100644 --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c @@ -1484,10 +1484,7 @@ static void pcs_irq_free(struct pcs_device *pcs) static void pcs_free_resources(struct pcs_device *pcs) { pcs_irq_free(pcs); - - if (pcs->pctl) - pinctrl_unregister(pcs->pctl); - + pinctrl_unregister(pcs->pctl); pcs_free_funcs(pcs); pcs_free_pingroups(pcs); }