PM / wakeup: Drop redundant check from device_init_wakeup()
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 2 Jan 2018 00:42:56 +0000 (01:42 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 2 Jan 2018 23:29:30 +0000 (00:29 +0100)
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>
drivers/base/power/wakeup.c

index 90c7212..b7b8b2f 100644 (file)
@@ -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);
        }