lkml.org 
[lkml]   [2017]   [Oct]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH] watchdog: lpc18xx_wdt: Convert timers to use
From
Date
On 10/04/2017 05:54 PM, Kees Cook wrote:
> In preparation for unconditionally passing the struct timer_list pointer to
> all timer callbacks, switch to using the new timer_setup() and from_timer()
> to pass the timer pointer explicitly.
>
> Cc: Wim Van Sebroeck <wim@iguana.be>
> Cc: Guenter Roeck <linux@roeck-us.net>
> Cc: Joachim Eastwood <manabian@gmail.com>
> Cc: linux-watchdog@vger.kernel.org
> Cc: linux-arm-kernel@lists.infradead.org
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Signed-off-by: Kees Cook <keescook@chromium.org>

Acked-by: Guenter Roeck <linux@roeck-us.net>

> ---
> This requires commit 686fef928bba ("timer: Prepare to change timer
> callback argument type") in v4.14-rc3, but should be otherwise
> stand-alone.
> ---
> drivers/watchdog/lpc18xx_wdt.c | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/watchdog/lpc18xx_wdt.c b/drivers/watchdog/lpc18xx_wdt.c
> index 3b8bb59adf02..b4221f43cd94 100644
> --- a/drivers/watchdog/lpc18xx_wdt.c
> +++ b/drivers/watchdog/lpc18xx_wdt.c
> @@ -78,10 +78,10 @@ static int lpc18xx_wdt_feed(struct watchdog_device *wdt_dev)
> return 0;
> }
>
> -static void lpc18xx_wdt_timer_feed(unsigned long data)
> +static void lpc18xx_wdt_timer_feed(struct timer_list *t)
> {
> - struct watchdog_device *wdt_dev = (struct watchdog_device *)data;
> - struct lpc18xx_wdt_dev *lpc18xx_wdt = watchdog_get_drvdata(wdt_dev);
> + struct lpc18xx_wdt_dev *lpc18xx_wdt = from_timer(lpc18xx_wdt, t, timer);
> + struct watchdog_device *wdt_dev = &lpc18xx_wdt->wdt_dev;
>
> lpc18xx_wdt_feed(wdt_dev);
>
> @@ -96,7 +96,9 @@ static void lpc18xx_wdt_timer_feed(unsigned long data)
> */
> static int lpc18xx_wdt_stop(struct watchdog_device *wdt_dev)
> {
> - lpc18xx_wdt_timer_feed((unsigned long)wdt_dev);
> + struct lpc18xx_wdt_dev *lpc18xx_wdt = watchdog_get_drvdata(wdt_dev);
> +
> + lpc18xx_wdt_timer_feed(&lpc18xx_wdt->timer);
>
> return 0;
> }
> @@ -267,8 +269,7 @@ static int lpc18xx_wdt_probe(struct platform_device *pdev)
>
> __lpc18xx_wdt_set_timeout(lpc18xx_wdt);
>
> - setup_timer(&lpc18xx_wdt->timer, lpc18xx_wdt_timer_feed,
> - (unsigned long)&lpc18xx_wdt->wdt_dev);
> + timer_setup(&lpc18xx_wdt->timer, lpc18xx_wdt_timer_feed, 0);
>
> watchdog_set_nowayout(&lpc18xx_wdt->wdt_dev, nowayout);
> watchdog_set_restart_priority(&lpc18xx_wdt->wdt_dev, 128);
>

\
 
 \ /
  Last update: 2017-10-05 03:15    [W:0.036 / U:0.116 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site