From: Guenter Roeck <linux@roeck-us.net>
To: Wolfram Sang <wsa@the-dreams.de>
Cc: linux-watchdog@vger.kernel.org,
linux-renesas-soc@vger.kernel.org,
Wolfram Sang <wsa+renesas@sang-engineering.com>
Subject: Re: [PATCH 3/7] watchdog: softdog: consistently use softdog_ prefix
Date: Wed, 25 May 2016 10:30:57 -0700 [thread overview]
Message-ID: <20160525173057.GE19545@roeck-us.net> (raw)
In-Reply-To: <1464158269-2447-4-git-send-email-wsa@the-dreams.de>
On Wed, May 25, 2016 at 08:37:45AM +0200, Wolfram Sang wrote:
> From: Wolfram Sang <wsa+renesas@sang-engineering.com>
>
> And move module_init/exit to the proper place while here.
>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> ---
> drivers/watchdog/softdog.c | 21 ++++++++++-----------
> 1 file changed, 10 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/watchdog/softdog.c b/drivers/watchdog/softdog.c
> index a9ad27dd46502b..0a29f5a0833787 100644
> --- a/drivers/watchdog/softdog.c
> +++ b/drivers/watchdog/softdog.c
> @@ -54,12 +54,12 @@ module_param(soft_panic, int, 0);
> MODULE_PARM_DESC(soft_panic,
> "Softdog action, set to 1 to panic, 0 to reboot (default=0)");
>
> -static void watchdog_fire(unsigned long);
> +static void softdog_fire(unsigned long);
>
> -static struct timer_list watchdog_ticktock =
> - TIMER_INITIALIZER(watchdog_fire, 0, 0);
> +static struct timer_list softdog_ticktock =
> + TIMER_INITIALIZER(softdog_fire, 0, 0);
>
> -static void watchdog_fire(unsigned long data)
> +static void softdog_fire(unsigned long data)
> {
> module_put(THIS_MODULE);
> if (soft_noboot)
> @@ -76,14 +76,14 @@ static void watchdog_fire(unsigned long data)
>
> static int softdog_ping(struct watchdog_device *w)
> {
> - if (!mod_timer(&watchdog_ticktock, jiffies+(w->timeout*HZ)))
> + if (!mod_timer(&softdog_ticktock, jiffies+(w->timeout*HZ)))
> __module_get(THIS_MODULE);
> return 0;
> }
>
> static int softdog_stop(struct watchdog_device *w)
> {
> - if (del_timer(&watchdog_ticktock))
> + if (del_timer(&softdog_ticktock))
> module_put(THIS_MODULE);
>
> return 0;
> @@ -115,7 +115,7 @@ static struct watchdog_device softdog_dev = {
> .timeout = TIMER_MARGIN,
> };
>
> -static int __init watchdog_init(void)
> +static int __init softdog_init(void)
> {
> int ret;
>
> @@ -132,14 +132,13 @@ static int __init watchdog_init(void)
>
> return 0;
> }
> +module_init(softdog_init);
>
> -static void __exit watchdog_exit(void)
> +static void __exit softdog_exit(void)
> {
> watchdog_unregister_device(&softdog_dev);
> }
> -
> -module_init(watchdog_init);
> -module_exit(watchdog_exit);
> +module_exit(softdog_exit);
>
> MODULE_AUTHOR("Alan Cox");
> MODULE_DESCRIPTION("Software Watchdog Device Driver");
> --
> 2.8.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2016-05-25 17:31 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-25 6:37 [PATCH 0/7] watchdog: softdog: cleanups Wolfram Sang
2016-05-25 6:37 ` [PATCH 1/7] watchdog: softdog: remove obsolete comments Wolfram Sang
2016-05-25 17:30 ` Guenter Roeck
2016-05-25 6:37 ` [PATCH 2/7] watchdog: softdog: use watchdog core to init timeout value Wolfram Sang
2016-05-25 17:30 ` Guenter Roeck
2016-05-25 6:37 ` [PATCH 3/7] watchdog: softdog: consistently use softdog_ prefix Wolfram Sang
2016-05-25 17:30 ` Guenter Roeck [this message]
2016-05-25 6:37 ` [PATCH 4/7] watchdog: softdog: remove forward declaration Wolfram Sang
2016-05-25 17:31 ` Guenter Roeck
2016-05-25 6:37 ` [PATCH 5/7] watchdog: softdog: sort includes to avoid duplicates Wolfram Sang
2016-05-25 17:31 ` Guenter Roeck
2016-05-25 6:37 ` [PATCH 6/7] watchdog: softdog: drop superfluous set_timeout callback Wolfram Sang
2016-05-25 17:31 ` Guenter Roeck
2016-05-25 6:37 ` [PATCH 7/7] watchdog: softdog: improve coding style Wolfram Sang
2016-05-25 17:31 ` Guenter Roeck
2016-07-17 19:48 ` [PATCH 0/7] watchdog: softdog: cleanups Wim Van Sebroeck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160525173057.GE19545@roeck-us.net \
--to=linux@roeck-us.net \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=wsa+renesas@sang-engineering.com \
--cc=wsa@the-dreams.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox