On 2 January 2018 at 01:42, Rafael J. Wysocki <r...@rjwysocki.net> wrote: > From: Rafael J. Wysocki <rafael.j.wyso...@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.wyso...@intel.com>
Reviewed-by: Ulf Hansson <ulf.hans...@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); > } > >