From patchwork Sat Jul 23 15:14:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 9244607 X-Patchwork-Delegate: rjw@sisk.pl Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5ABC460213 for ; Sat, 23 Jul 2016 15:14:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3EFEF1FF60 for ; Sat, 23 Jul 2016 15:14:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1DDC726538; Sat, 23 Jul 2016 15:14:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B36D01FF60 for ; Sat, 23 Jul 2016 15:14:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751082AbcGWPOa (ORCPT ); Sat, 23 Jul 2016 11:14:30 -0400 Received: from mout.web.de ([212.227.17.11]:64757 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750882AbcGWPO3 (ORCPT ); Sat, 23 Jul 2016 11:14:29 -0400 Received: from [192.168.1.2] ([78.53.49.29]) by smtp.web.de (mrweb102) with ESMTPSA (Nemesis) id 0LsQPU-1bKKlH0PEW-011zEs; Sat, 23 Jul 2016 17:14:03 +0200 Subject: [PATCH] PM-wakeup: Delete unnecessary checks before three function calls To: linux-pm@vger.kernel.org, Greg Kroah-Hartman , Len Brown , Pavel Machek , "Rafael J. Wysocki" References: <5307CAA2.8060406@users.sourceforge.net> <5786434.e97HVzPjpI@vostro.rjw.lan> <1722549.jyvuK0dZRm@vostro.rjw.lan> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <88d6d524-c093-4fcd-35ba-ff19f7b21fe2@users.sourceforge.net> Date: Sat, 23 Jul 2016 17:14:00 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2 MIME-Version: 1.0 In-Reply-To: <1722549.jyvuK0dZRm@vostro.rjw.lan> X-Provags-ID: V03:K0:/LJkuOcU5Y3BSawDEtFjgouwwEmkag1zF/54nvRxqx5cvK7KiwK BdeU764UaEIX+U4vcxRp+UKCCcm+EE6glrAgYaTByUtVjzw/sji7w8Q18Q1TQafBbhHdFxB 8Gba4whMSam9IROVy8JaWU5ejB1mKLrOcw7noVH1ZjgIICmSAm/MWRoco1YQiOMxyKxygrT afG/gSYIyEcgoTHCnUgCA== X-UI-Out-Filterresults: notjunk:1; V01:K0:5LU9Epq4GZk=:6zDPHLfo8UL5fzUMOrvnpt QdWwkOxBoxDAkciJREUYK7+6WS7pdVjPDqq+6KiTixAxlWAE8be95pS6+AxDDe4gboGda+psB BUrN6e/Cn2Y4MZDsOgbbRY4c5mUIzmdOKVOJq5DnntQ98R9q9P2q0JzAGtbWEKpA/I9kL1den maMHFreegRxSTRBpqW5qd6387yiwc40FLuRJ8f6XlU5EJql1HMCtxy47ZLeTUxNFTT4GNqwIt B2+Ir1ACuYq937KAffrWX2aPgavI9R/dCuJ42Gs4CSidph2H/YmIanaC58RJJVrG/RdhpmwYx mdeeI99FCej2ZcAH7ujDk2EOhaUYaVyyTcYZpRxW9qX90F5cuj1TS1x2Ok3lMYvT3thw4dMUt Fmh2nf4b6PjPVsBKRM8NC54/jBgeTP0kXSju9HBqdXaJ4Ef0o5DoYN6t3z3Ufgwn83QKZXvl8 pzPC71XYTcA+UfoGE58Eqc6IbCQWzeJlisjV3f3wKJ8gKYjnuv3OUHEUELcA3ZdS8DNBv2+E4 YXVqnGM90Q8W/TSZHWwRCnNyZF/l4bCPVomuSOW14rYpnfUwNixroDOwMjUrO674WKG9R9Sqh haCS3/DEeAh610IT+KMuRgQbqrwuGuRKy97qJcbqq0GjaS25yLBNfwE+wdi1wVE+UGLVG9AID cYYsDnKMQIhmH8WHzYlaWtcYRasEB/FWPKl90uWL26HTeNG8n8Ow6R+paIYujfKlvv317/Cto b4uEq8KkTHuLXJrDswj1g1Sw6+k2Teng2R4jjPajDAl2ztaPkiqoccZ04IBgkjMA0sFlygDmC rXkZAYu Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Markus Elfring Date: Sat, 23 Jul 2016 17:04:00 +0200 The following functions test whether their argument is NULL and then return immediately. * dev_pm_arm_wake_irq * dev_pm_disarm_wake_irq * wakeup_source_unregister Thus the test around the calls is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring Acked-by: Pavel Machek --- drivers/base/power/wakeup.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c index 5fb7718..c35d3f5 100644 --- a/drivers/base/power/wakeup.c +++ b/drivers/base/power/wakeup.c @@ -334,10 +334,8 @@ void device_wakeup_arm_wake_irqs(void) struct wakeup_source *ws; rcu_read_lock(); - list_for_each_entry_rcu(ws, &wakeup_sources, entry) { - if (ws->wakeirq) - dev_pm_arm_wake_irq(ws->wakeirq); - } + list_for_each_entry_rcu(ws, &wakeup_sources, entry) + dev_pm_arm_wake_irq(ws->wakeirq); rcu_read_unlock(); } @@ -351,10 +349,8 @@ void device_wakeup_disarm_wake_irqs(void) struct wakeup_source *ws; rcu_read_lock(); - list_for_each_entry_rcu(ws, &wakeup_sources, entry) { - if (ws->wakeirq) - dev_pm_disarm_wake_irq(ws->wakeirq); - } + list_for_each_entry_rcu(ws, &wakeup_sources, entry) + dev_pm_disarm_wake_irq(ws->wakeirq); rcu_read_unlock(); } @@ -390,9 +386,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);