* [PATCH] PM / wakeup: Drop redundant check from device_init_wakeup()
@ 2018-01-02 0:42 Rafael J. Wysocki
2018-01-02 13:44 ` Ulf Hansson
0 siblings, 1 reply; 2+ messages in thread
From: Rafael J. Wysocki @ 2018-01-02 0:42 UTC (permalink / raw)
To: Linux PM; +Cc: LKML
From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Since device_wakeup_disable() checks the device's power.can_wakeup
flag, device_init_wakeup() doesn't need to do that before calling it,
so drop that redundant check from device_init_wakeup().
No intentional changes in functionality.
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
---
drivers/base/power/wakeup.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
Index: linux-pm/drivers/base/power/wakeup.c
===================================================================
--- linux-pm.orig/drivers/base/power/wakeup.c
+++ linux-pm/drivers/base/power/wakeup.c
@@ -448,9 +448,7 @@ int device_init_wakeup(struct device *de
device_set_wakeup_capable(dev, true);
ret = device_wakeup_enable(dev);
} else {
- if (dev->power.can_wakeup)
- device_wakeup_disable(dev);
-
+ device_wakeup_disable(dev);
device_set_wakeup_capable(dev, false);
}
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] PM / wakeup: Drop redundant check from device_init_wakeup()
2018-01-02 0:42 [PATCH] PM / wakeup: Drop redundant check from device_init_wakeup() Rafael J. Wysocki
@ 2018-01-02 13:44 ` Ulf Hansson
0 siblings, 0 replies; 2+ messages in thread
From: Ulf Hansson @ 2018-01-02 13:44 UTC (permalink / raw)
To: Rafael J. Wysocki; +Cc: Linux PM, LKML
On 2 January 2018 at 01:42, Rafael J. Wysocki <rjw@rjwysocki.net> wrote:
> From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
>
> Since device_wakeup_disable() checks the device's power.can_wakeup
> flag, device_init_wakeup() doesn't need to do that before calling it,
> so drop that redundant check from device_init_wakeup().
>
> No intentional changes in functionality.
>
> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Kind regards
Uffe
> ---
> drivers/base/power/wakeup.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> Index: linux-pm/drivers/base/power/wakeup.c
> ===================================================================
> --- linux-pm.orig/drivers/base/power/wakeup.c
> +++ linux-pm/drivers/base/power/wakeup.c
> @@ -448,9 +448,7 @@ int device_init_wakeup(struct device *de
> device_set_wakeup_capable(dev, true);
> ret = device_wakeup_enable(dev);
> } else {
> - if (dev->power.can_wakeup)
> - device_wakeup_disable(dev);
> -
> + device_wakeup_disable(dev);
> device_set_wakeup_capable(dev, false);
> }
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-01-02 13:45 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-01-02 0:42 [PATCH] PM / wakeup: Drop redundant check from device_init_wakeup() Rafael J. Wysocki
2018-01-02 13:44 ` Ulf Hansson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®