From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752453AbbF1KWQ (ORCPT ); Sun, 28 Jun 2015 06:22:16 -0400 Received: from mout.web.de ([212.227.17.12]:64119 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752282AbbF1KWJ (ORCPT ); Sun, 28 Jun 2015 06:22:09 -0400 Message-ID: <558FCAC1.1090605@users.sourceforge.net> Date: Sun, 28 Jun 2015 12:21:53 +0200 From: SF Markus Elfring User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Greg Kroah-Hartman , Len Brown , Pavel Machek , "Rafael J. Wysocki" , linux-pm@vger.kernel.org CC: LKML , kernel-janitors@vger.kernel.org, Julia Lawall Subject: [PATCH] PM-wakeup: Delete unnecessary checks before two function calls 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> <546C7E75.9080301@users.sourceforge.net> In-Reply-To: <546C7E75.9080301@users.sourceforge.net> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:MJzg5flGBplzz0FOwNrGODNHTkSAHYD5YMLr9DKrbZv4ASn11fV q9eWshYh32APfWhPSRLdSf86jalw5wDK4wnehgdWyyOASNzuPGxiOSg/EwXvKO2ximy6Hvl LYlaudd+6GoVzp9m1v0X8ZooY/uDZeOgiX+RykOi22nZ7v2V7DduVcnw1+gBAYJsD6LCcO/ N57DJQeXUdHOG9bAw3Y1A== X-UI-Out-Filterresults: notjunk:1;V01:K0:0YX9PiXncb0=:9R0t5gHrqB/bwO0o7BftxL 5o/0gUS1MS1NebQIiFsRZrGr5t8uvGQwg0IIrkNS9JAkvjk1E9PmXYKLjagXq80XMkU1CVg2r Y6Jea3hQgdN/0bulx3YwtC+XTsi6wP9JP4cJQZ0ua6cpzKPMyy0wI4IBEHJ5pKFLUz84F16I8 XPkxX3niUGO5Y4BPdl5C9iFKdiaWHGQgVJaAUCvZH3Qxh0ruPeuhKqW5h6sPi4OY+wDdsb/J7 IjrvYo/EZmx34aa0OBLhMn0vWQ90q1infqh59kINUXSPdYxwn6imoUpgNbn/4NHt/GdtTsNTi vqamRGQpm35TXqu/DyWSPhkOKhCLpaDX4tRAVCT7Fzw8wN3a79Ha0O/Z/1Q7ZOTpd/I7O8iUZ 7nPckZDAss7Br+NuLX1Qv2AZOZtmtRRyre/caFneteSwwsefcHs2EbCNWK1rSNijIGAKAQvzX 1Ucd5DWgUdgd/Yf25R7FQAvKrBHx5H6z3ZgmmSLeuVdRfCrKx1gy5Ixw/xFWn04+XvQbav2wE btwBOW3MS3Lmv0bSv/0gosP0Xy6h8GtTKAqkAN0KeAi6rMpUckvQCtk6YkItXYy1mfAOH7pf2 2uubPIafuZUikNyge3EhJ3g3x4pc4wl0YWN+1DoMEVEPS8zSqXGkdi+/Qv+NAhQ0d2wQyaVe+ VQBLkRPXc+sdqliOrqrg5qxH0r3FALQvH+e2oBQmFWzErTghC+cQtnG0tV7d9acGOXSI= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sun, 28 Jun 2015 12:14:43 +0200 The functions dev_pm_disarm_wake_irq() and wakeup_source_unregister() test whether their argument is NULL and then return 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/base/power/wakeup.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c index 40f7160..3741bc2 100644 --- a/drivers/base/power/wakeup.c +++ b/drivers/base/power/wakeup.c @@ -341,8 +341,7 @@ void device_wakeup_arm_wake_irqs(void) rcu_read_lock(); list_for_each_entry_rcu(ws, &wakeup_sources, entry) { - if (ws->wakeirq) - dev_pm_arm_wake_irq(ws->wakeirq); + dev_pm_arm_wake_irq(ws->wakeirq); } rcu_read_unlock(); } @@ -358,8 +357,7 @@ void device_wakeup_disarm_wake_irqs(void) rcu_read_lock(); list_for_each_entry_rcu(ws, &wakeup_sources, entry) { - if (ws->wakeirq) - dev_pm_disarm_wake_irq(ws->wakeirq); + dev_pm_disarm_wake_irq(ws->wakeirq); } rcu_read_unlock(); } @@ -396,9 +394,7 @@ int device_wakeup_disable(struct device *dev) return -EINVAL; ws = device_wakeup_detach(dev); - if (ws) - wakeup_source_unregister(ws); - + wakeup_source_unregister(ws); return 0; } EXPORT_SYMBOL_GPL(device_wakeup_disable); -- 2.4.4