Re: [PATCH 1/3] PM: wakeup: make device_wakeup_disable return void

[Dhruva Gole]

On Mar 18, 2024 at 14:47:45 +0100, Rafael J. Wysocki wrote:
> On Mon, Mar 18, 2024 at 6:55 AM Dhruva Gole <d-gole@xxxxxx> wrote:
> >
> > The device_wakeup_disable call only returns an error if no dev exists
> > however there's not much a user can do at that point.
> > Rather make this function return void.
> >
> > Signed-off-by: Dhruva Gole <d-gole@xxxxxx>
> > ---
> >  drivers/base/power/wakeup.c | 11 +++++++----
> >  include/linux/pm_wakeup.h   |  5 ++---
> >  2 files changed, 9 insertions(+), 7 deletions(-)
> >
> > diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c
> > index a917219feea6..752b417e8129 100644
> > --- a/drivers/base/power/wakeup.c
> > +++ b/drivers/base/power/wakeup.c
> > @@ -451,16 +451,15 @@ static struct wakeup_source *device_wakeup_detach(struct device *dev)
> >   * Detach the @dev's wakeup source object from it, unregister this wakeup source
> >   * object and destroy it.
> >   */
> > -int device_wakeup_disable(struct device *dev)
> > +void device_wakeup_disable(struct device *dev)
> >  {
> >         struct wakeup_source *ws;
> >
> >         if (!dev || !dev->power.can_wakeup)
> > -               return -EINVAL;
> > +               return;
> >
> >         ws = device_wakeup_detach(dev);
> >         wakeup_source_unregister(ws);
> > -       return 0;
> >  }
> >  EXPORT_SYMBOL_GPL(device_wakeup_disable);
> >
> > @@ -502,7 +501,11 @@ EXPORT_SYMBOL_GPL(device_set_wakeup_capable);
> >   */
> >  int device_set_wakeup_enable(struct device *dev, bool enable)
> >  {
> > -       return enable ? device_wakeup_enable(dev) : device_wakeup_disable(dev);
> > +       if (enable)
> > +               return device_wakeup_enable(dev);
> > +
> > +       device_wakeup_disable(dev);
> > +       return 0;
> >  }
> >  EXPORT_SYMBOL_GPL(device_set_wakeup_enable);
> >
> > diff --git a/include/linux/pm_wakeup.h b/include/linux/pm_wakeup.h
> > index 6eb9adaef52b..428803eed798 100644
> > --- a/include/linux/pm_wakeup.h
> > +++ b/include/linux/pm_wakeup.h
> > @@ -107,7 +107,7 @@ extern void wakeup_sources_read_unlock(int idx);
> >  extern struct wakeup_source *wakeup_sources_walk_start(void);
> >  extern struct wakeup_source *wakeup_sources_walk_next(struct wakeup_source *ws);
> >  extern int device_wakeup_enable(struct device *dev);
> > -extern int device_wakeup_disable(struct device *dev);
> > +extern void device_wakeup_disable(struct device *dev);
> 
> This change will introduce a build error in sdhci-pci-core.c AFAICS,
> so you need to modify this file in the same patch to avoid bisection
> breakage.

Alright, I have respinned the series and fixed up the first patch
itself.

Thanks!


-- 
Best regards,
Dhruva Gole <d-gole@xxxxxx>