From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757439AbbKFP5O (ORCPT ); Fri, 6 Nov 2015 10:57:14 -0500 Received: from mout.web.de ([212.227.15.4]:57869 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752121AbbKFP5L (ORCPT ); Fri, 6 Nov 2015 10:57:11 -0500 Subject: [PATCH] bq2415x_charger: Delete unnecessary checks before the function call "of_node_put" 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: David Woodhouse , Dmitry Eremin-Solenikov , =?UTF-8?Q?Pali_Roh=c3=a1r?= , Sebastian Reichel , linux-pm@vger.kernel.org Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <563CCDB1.1040703@users.sourceforge.net> Date: Fri, 6 Nov 2015 16:56:33 +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> Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:kAwI7TZBuOuzAksI/VL4LJ79OtZLS7GTap9D6eSowdbVvxODx4+ j+wujGBuzpdzffLX6ZQojoCrYck+nyjTYU8LL/yCTXMJAE0j1zMoIR88Gg0k5jyEKlLhwQ2 E1C0oc+WxwKq2R33mkgdtuz7a3Nf1DMoPx7IFLRcjRyzL79jPvJaaA3G6zeIPdDslB53P6Y FcwIXzVjZijI50IouL+Lw== X-UI-Out-Filterresults: notjunk:1;V01:K0:PVCqgSKprRA=:TILTBy6Xm0UnqDOSBgylg3 bAsqI3faiH2L0Lk1W1yOXiy0jcq9iJOiECsZa/QMhd1LqQcjXRxsXajytvDpYg+1kVVPynxT9 WioyhgdUceqXCv2YkB9FyaK8JzYDDwhOateR0b6yqNdoKDn0pydM+cIiv3NKW9spnBEGVUkea rJn/aSNsmGcwNFaENXO2IiNT+l3Q62l93Of3F+/CDBOe1tlrgg0RHShJaxYxYbZUfOWLgf39O yozXNwwA6XQEQ+Tja0goSmdoVGVgJpBTZC+9yeo3xZJ1foJlY5pEVyxxP1LGoi8cHJSmFXRvz dRUIa7DSQuEQmPlWRkWfY2hwaJodhTFdVz7JRF9fjjm05SoCAebdZ74mVfie1aDrKJoZ6VVlz tBvNwoCKcukvFk5S1HzTzeHefMRcPIFC2xEkRwpy4ld9wewRy/D1qxXt/sRygearZuA66PYzq /h+idXAu/6U1uqpHY+SOfpjtk3STWnXojMeycN9qvVOXC/XQfNiwMG9mKDWWBbWw0ekvueHov Qp3+0PYptlJfyNEncXTcAdH9SJTM5D7OzqtpGotw72QObbGwu8NjmryIJ2pU23NQRvEWmYT/y asgo2zy6pSF9ekK21bVyJ/fr+yNc/Bo6LoOCR8Q/JQfyAeUNGxCHNovJrIatneU9Ohrh7+WST G8wRaJ7xH7+0z2EbfpxgCErFZSOGLFbU8tvlpWCveJ8MIPggZxep1xsXfRREqhSJHuo/VSp5u X1sqk2xaN7cqg+RHrVdB78ZD7aONnhaoa2WXbKeW4VdbHplysOz4sQ7O7L2alTzoOnygjPfGg NNtPm/N 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 16:48:46 +0100 The of_node_put() function tests whether its argument is NULL and then returns immediately. Thus the test around the calls is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- drivers/power/bq2415x_charger.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/power/bq2415x_charger.c b/drivers/power/bq2415x_charger.c index 4afd768..27e8953 100644 --- a/drivers/power/bq2415x_charger.c +++ b/drivers/power/bq2415x_charger.c @@ -1704,7 +1704,7 @@ error_4: error_3: bq2415x_power_supply_exit(bq); error_2: - if (bq && bq->notify_node) + if (bq) of_node_put(bq->notify_node); kfree(name); error_1: @@ -1724,9 +1724,7 @@ static int bq2415x_remove(struct i2c_client *client) if (bq->nb.notifier_call) power_supply_unreg_notifier(&bq->nb); - if (bq->notify_node) - of_node_put(bq->notify_node); - + of_node_put(bq->notify_node); bq2415x_sysfs_exit(bq); bq2415x_power_supply_exit(bq); -- 2.6.2