From: Rafael J. Wysocki Date: Tue, 2 Jan 2018 00:42:56 +0000 (+0100) Subject: PM / wakeup: Drop redundant check from device_init_wakeup() X-Git-Tag: v4.19~1775^2~2^2~18 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9dbc64a5d5938b990a045509ff5356fc53e4abd4;p=platform%2Fkernel%2Flinux-rpi.git PM / wakeup: Drop redundant check from device_init_wakeup() 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 Reviewed-by: Ulf Hansson --- diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c index 90c7212..b7b8b2f 100644 --- a/drivers/base/power/wakeup.c +++ b/drivers/base/power/wakeup.c @@ -448,9 +448,7 @@ int device_init_wakeup(struct device *dev, bool enable) 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); }