Re: [PATCH v2] PM: sleep: wakeirq: harden dev_pm_clear_wake_irq() against races

[Rafael J. Wysocki]

On Tue, Feb 3, 2026 at 10:16 AM Markus Elfring <Markus.Elfring@xxxxxx> wrote:
>
> …
> > +++ b/drivers/base/power/wakeirq.c
> > @@ -83,13 +83,16 @@ EXPORT_SYMBOL_GPL(dev_pm_set_wake_irq);
> >   */
> >  void dev_pm_clear_wake_irq(struct device *dev)
> >  {
> > -     struct wake_irq *wirq = dev->power.wakeirq;
> > +     struct wake_irq *wirq;
> >       unsigned long flags;
> >
> > -     if (!wirq)
> > +     spin_lock_irqsave(&dev->power.lock, flags);
> > +     wirq = dev->power.wakeirq;
> > +     if (!wirq) {
> > +             spin_unlock_irqrestore(&dev->power.lock, flags);
> >               return;
> > +     }
> >
> > -     spin_lock_irqsave(&dev->power.lock, flags);
> >       device_wakeup_detach_irq(dev);
> >       dev->power.wakeirq = NULL;
> >       spin_unlock_irqrestore(&dev->power.lock, flags);
>
> Would it become feasible to apply a scoped_guard() call?
> https://elixir.bootlin.com/linux/v6.19-rc5/source/include/linux/spinlock.h#L585

Yes, it would, but in a separate patch.