linux-pm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: SF Markus Elfring <elfring@users.sourceforge.net>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Len Brown <len.brown@intel.com>, Pavel Machek <pavel@ucw.cz>,
	"Rafael J. Wysocki" <rjw@rjwysocki.net>,
	linux-pm@vger.kernel.org
Cc: LKML <linux-kernel@vger.kernel.org>,
	kernel-janitors@vger.kernel.org,
	Julia Lawall <julia.lawall@lip6.fr>
Subject: [PATCH] PM-wakeup: Delete unnecessary checks before two function calls
Date: Sun, 28 Jun 2015 12:21:53 +0200	[thread overview]
Message-ID: <558FCAC1.1090605@users.sourceforge.net> (raw)
In-Reply-To: <546C7E75.9080301@users.sourceforge.net>

From: Markus Elfring <elfring@users.sourceforge.net>
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 <elfring@users.sourceforge.net>
---
 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


  parent reply	other threads:[~2015-06-28 10:22 UTC|newest]

Thread overview: 30+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <5307CAA2.8060406@users.sourceforge.net>
     [not found] ` <alpine.DEB.2.02.1402212321410.2043@localhost6.localdomain6>
     [not found]   ` <530A086E.8010901@users.sourceforge.net>
     [not found]     ` <alpine.DEB.2.02.1402231635510.1985@localhost6.localdomain6>
     [not found]       ` <530A72AA.3000601@users.sourceforge.net>
     [not found]         ` <alpine.DEB.2.02.1402240658210.2090@localhost6.localdomain6>
     [not found]           ` <530B5FB6.6010207@users.sourceforge.net>
     [not found]             ` <alpine.DEB.2.10.1402241710370.2074@hadrien>
     [not found]               ` <530C5E18.1020800@users.sourceforge.net>
     [not found]                 ` <alpine.DEB.2.10.1402251014170.2080@hadrien>
     [not found]                   ` <530CD2C4.4050903@users.sourceforge.net>
     [not found]                     ` <alpine.DEB.2.10.1402251840450.7035@hadrien>
     [not found]                       ` <530CF8FF.8080600@users.sourceforge.net>
     [not found]                         ` <alpine.DEB.2.02.1402252117150.2047@localhost6.localdomain6>
     [not found]                           ` <530DD06F.4090703@users.sourceforge.net>
     [not found]                             ` <alpine.DEB.2.02.1402262129250.2221@localhost6.localdomain6>
     [not found]                               ` <5317A59D.4@users.so urceforge.net>
     [not found]                                 ` <5317A59D.4@users.sourceforge.net>
2014-11-16 13:28                                   ` [PATCH 1/1] kernel-power: Deletion of an unnecessary check before the function call "vfree" SF Markus Elfring
2014-11-18 23:32                                     ` Rafael J. Wysocki
2014-11-19 11:26                                   ` [PATCH 1/1] PM-wakeup: Deletion of an unnecessary check before the function call "wakeup_source_unregister" SF Markus Elfring
2014-11-19 12:09                                     ` Dan Carpenter
2014-11-19 12:54                                       ` walter harms
2014-11-19 13:05                                         ` Dan Carpenter
2014-11-19 13:39                                           ` walter harms
2015-06-28 10:21                                     ` SF Markus Elfring [this message]
2015-08-14  6:56                                       ` [PATCH] PM-wakeup: Delete unnecessary checks before two function calls Pavel Machek
2016-07-22 20:35                                       ` SF Markus Elfring
2016-07-22 21:52                                         ` Rafael J. Wysocki
2016-07-23  5:32                                           ` SF Markus Elfring
2016-07-23 12:18                                             ` Rafael J. Wysocki
2016-07-23 15:14                                               ` [PATCH] PM-wakeup: Delete unnecessary checks before three " SF Markus Elfring
2016-07-28 19:33                                                 ` Pavel Machek
2014-11-21 10:12                                   ` [PATCH 1/1] thermal: Exynos: Deletion of unnecessary checks before two " SF Markus Elfring
2014-11-21 10:17                                     ` Julia Lawall
2014-11-21 13:25                                       ` SF Markus Elfring
2014-11-21 16:17                                       ` [PATCH v2] " SF Markus Elfring
2014-12-01  4:50                                   ` [PATCH 1/1] thermal: int3403: Delete a check before thermal_zone_device_unregister() SF Markus Elfring
2014-12-08  4:15                                     ` Zhang Rui
2015-02-03 10:21                                   ` [PATCH] ti-soc-thermal: Delete an unnecessary check before the function call "cpufreq_cooling_unregister" SF Markus Elfring
2015-02-03 18:25                                   ` [PATCH] cpufreq-dt: " SF Markus Elfring
2015-02-04 14:42                                     ` Rafael J. Wysocki
2015-11-05 20:15                                   ` [PATCH] CPPC-CPUFreq: Delete an unnecessary check before the function call "kfree" SF Markus Elfring
2015-11-06  1:42                                     ` Viresh Kumar
2015-11-07  1:10                                       ` Rafael J. Wysocki
2015-11-06 15:56                                   ` [PATCH] bq2415x_charger: Delete unnecessary checks before the function call "of_node_put" SF Markus Elfring
2015-11-06 16:13                                     ` Pali Rohár
2016-07-23 13:02                                   ` [PATCH] power: generic-adc-battery: Delete unnecessary checks before the function call "iio_channel_release" SF Markus Elfring

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=558FCAC1.1090605@users.sourceforge.net \
    --to=elfring@users.sourceforge.net \
    --cc=gregkh@linuxfoundation.org \
    --cc=julia.lawall@lip6.fr \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=len.brown@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=pavel@ucw.cz \
    --cc=rjw@rjwysocki.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).