| Message ID | 20221027150926.394670044@goodmis.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | None | expand |
On Thu, Oct 27, 2022 at 5:09 PM Steven Rostedt <rostedt@goodmis.org> wrote: > > From: "Steven Rostedt (Google)" <rostedt@goodmis.org> > > Instead of open coding making the timer look like it was not registered by > setting the function pointer to NULL, call del_timer_shutdown() that does > the same thing. > > Link: https://lore.kernel.org/all/20220407161745.7d6754b3@gandalf.local.home/ > > Cc: "Rafael J. Wysocki" <rafael@kernel.org> > Cc: Len Brown <len.brown@intel.com> > Cc: Pavel Machek <pavel@ucw.cz> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Cc: linux-pm@vger.kernel.org > Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org> Please add "wakeup:" to the subject after "PM:". Apart from this Acked-by: Rafael J. Wysocki <rafael@kernel.org> > --- > drivers/base/power/wakeup.c | 7 +------ > 1 file changed, 1 insertion(+), 6 deletions(-) > > diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c > index 7cc0c0cf8eaa..c690f6c0d670 100644 > --- a/drivers/base/power/wakeup.c > +++ b/drivers/base/power/wakeup.c > @@ -202,12 +202,7 @@ void wakeup_source_remove(struct wakeup_source *ws) > raw_spin_unlock_irqrestore(&events_lock, flags); > synchronize_srcu(&wakeup_srcu); > > - del_timer_sync(&ws->timer); > - /* > - * Clear timer.function to make wakeup_source_not_registered() treat > - * this wakeup source as not registered. > - */ > - ws->timer.function = NULL; > + del_timer_shutdown(&ws->timer); > } > EXPORT_SYMBOL_GPL(wakeup_source_remove); > > -- > 2.35.1
diff --git a/drivers/base/power/wakeup.c b/drivers/base/power/wakeup.c index 7cc0c0cf8eaa..c690f6c0d670 100644 --- a/drivers/base/power/wakeup.c +++ b/drivers/base/power/wakeup.c @@ -202,12 +202,7 @@ void wakeup_source_remove(struct wakeup_source *ws) raw_spin_unlock_irqrestore(&events_lock, flags); synchronize_srcu(&wakeup_srcu); - del_timer_sync(&ws->timer); - /* - * Clear timer.function to make wakeup_source_not_registered() treat - * this wakeup source as not registered. - */ - ws->timer.function = NULL; + del_timer_shutdown(&ws->timer); } EXPORT_SYMBOL_GPL(wakeup_source_remove);