diff mbox series

[RFC,v2,07/31] timers: PM: Use del_timer_shutdown()

Message ID	20221027150926.394670044@goodmis.org
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Message-ID: <20221027150926.394670044@goodmis.org> User-Agent: quilt/0.66 Date: Thu, 27 Oct 2022 11:05:32 -0400 From: Steven Rostedt <rostedt@goodmis.org> To: linux-kernel@vger.kernel.org Cc: Linus Torvalds <torvalds@linux-foundation.org>, Thomas Gleixner <tglx@linutronix.de>, Stephen Boyd <sboyd@kernel.org>, Guenter Roeck <linux@roeck-us.net>, "Rafael J. Wysocki" <rafael@kernel.org>, Len Brown <len.brown@intel.com>, Pavel Machek <pavel@ucw.cz>, Greg Kroah-Hartman <gregkh@linuxfoundation.org>, linux-pm@vger.kernel.org Subject: [RFC][PATCH v2 07/31] timers: PM: Use del_timer_shutdown() References: <20221027150525.753064657@goodmis.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Precedence: bulk
Series	timers: Use del_timer_shutdown() before freeing timers \| [RFC,v2,00/31] timers: Use del_timer_shutdown() before freeing timers [RFC,v2,01/31] timers: Add del_timer_shutdown() to be called before freeing timers [RFC,v2,02/31] timers: s390/cmm: Use del_timer_shutdown() before freeing timer [RFC,v2,03/31] timers: sh: Use del_timer_shutdown() before freeing timer [RFC,v2,05/31] timers: ACPI: Use del_timer_shutdown() before freeing timer [RFC,v2,06/31] timers: atm: Use del_timer_shutdown() before freeing timer [RFC,v2,07/31] timers: PM: Use del_timer_shutdown() [RFC,v2,08/31] timers: Bluetooth: Use del_timer_shutdown() before freeing timer [RFC,v2,09/31] timers: hangcheck: Use del_timer_shutdown() before freeing timer [RFC,v2,10/31] timers: ipmi: Use del_timer_shutdown() before freeing timer [RFC,v2,11/31] timers: random: Use del_timer_shutdown() before freeing timer [RFC,v2,14/31] timers: HID: Use del_timer_shutdown() before freeing timer [RFC,v2,16/31] timers: mISDN: Use del_timer_shutdown() before freeing timer [RFC,v2,17/31] timers: leds: Use del_timer_shutdown() before freeing timer [RFC,v2,19/31] timers: net: Use del_timer_shutdown() before freeing timer [RFC,v2,20/31] timers: usb: Use del_timer_shutdown() before freeing timer [RFC,v2,21/31] timers: cgroup: Use del_timer_shutdown() before freeing timer [RFC,v2,22/31] timers: workqueue: Use del_timer_shutdown() before freeing timer [RFC,v2,23/31] timers: nfc: pn533: Use del_timer_shutdown() before freeing timer [RFC,v2,24/31] timers: pcmcia: Use del_timer_shutdown() before freeing timer [RFC,v2,25/31] timers: scsi: Use del_timer_shutdown() before freeing timer [RFC,v2,26/31] timers: tty: Use del_timer_shutdown() before freeing timer [RFC,v2,27/31] timers: ext4: Use del_timer_shutdown() before freeing timer [RFC,v2,28/31] timers: fs/nilfs2: Use del_timer_shutdown() before freeing timer [RFC,v2,29/31] timers: ALSA: Use del_timer_shutdown() before freeing timer [RFC,v2,30/31] timers: x86/mce: Use __init_timer() for resetting timers [RFC,v2,31/31] timers: Expand DEBUG_OBJECTS_TIMER to check if it ever was used

Commit Message

Steven Rostedt Oct. 27, 2022, 3:05 p.m. UTC

  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>
---
 drivers/base/power/wakeup.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

Comments

Rafael J. Wysocki Oct. 28, 2022, 5:45 p.m. UTC | #1

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 mbox series

Patch

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);