From: Sergei Shtylyov <sshtylyov@mvista.com>
To: Hauke Mehrtens <hauke@hauke-m.de>
Cc: linville@tuxdriver.com, linux-wireless@vger.kernel.org,
wim@iguana.be, linux-watchdog@vger.kernel.org,
castet.matthieu@free.fr, biblbroks@sezampro.rs, m@bues.ch,
zajec5@gmail.com, linux-mips@linux-mips.org
Subject: Re: [PATCH 04/15] watchdog: bcm47xx_wdt.c: rename wdt_timeout to timeout
Date: Sun, 25 Nov 2012 02:36:06 +0400 [thread overview]
Message-ID: <50B14BD6.8050302@mvista.com> (raw)
In-Reply-To: <1353795855-22236-5-git-send-email-hauke@hauke-m.de>
Hello.
On 25-11-2012 2:24, Hauke Mehrtens wrote:
> Rename rename
Once it enough. :-)
> wdt_timeout
'wdt_time', you mean?
> to timeout to name it like the other watchdog
> driver do it.
It's not the only change you're doing.
> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
> ---
> drivers/watchdog/bcm47xx_wdt.c | 14 +++++++-------
> 1 file changed, 7 insertions(+), 7 deletions(-)
> diff --git a/drivers/watchdog/bcm47xx_wdt.c b/drivers/watchdog/bcm47xx_wdt.c
> index 66f2d2b..b6a8c49 100644
> --- a/drivers/watchdog/bcm47xx_wdt.c
> +++ b/drivers/watchdog/bcm47xx_wdt.c
> @@ -30,13 +30,13 @@
> #define DRV_NAME "bcm47xx_wdt"
>
> #define WDT_DEFAULT_TIME 30 /* seconds */
> -#define WDT_MAX_TIME 255 /* seconds */
> +#define WDT_SOFTTIMER_MAX 3600 /* seconds */
>
> -static int wdt_time = WDT_DEFAULT_TIME;
> +static int timeout = WDT_DEFAULT_TIME;
> static bool nowayout = WATCHDOG_NOWAYOUT;
>
> -module_param(wdt_time, int, 0);
> -MODULE_PARM_DESC(wdt_time, "Watchdog time in seconds. (default="
> +module_param(timeout, int, 0);
> +MODULE_PARM_DESC(timeout, "Watchdog time in seconds. (default="
> __MODULE_STRING(WDT_DEFAULT_TIME) ")");
>
> module_param(nowayout, bool, 0);
> @@ -94,9 +94,9 @@ static int bcm47xx_wdt_soft_stop(struct watchdog_device *wdd)
> static int bcm47xx_wdt_soft_set_timeout(struct watchdog_device *wdd,
> unsigned int new_time)
> {
> - if (new_time < 1 || new_time > WDT_MAX_TIME) {
> + if (new_time < 1 || new_time > WDT_SOFTTIMER_MAX) {
> pr_warn("timeout value must be 1<=x<=%d, using %d\n",
> - WDT_MAX_TIME, new_time);
> + WDT_SOFTTIMER_MAX, new_time);
> return -EINVAL;
> }
>
WBR, Sergei
next prev parent reply other threads:[~2012-11-24 22:37 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-24 22:24 [PATCH 00/15] watchdog/bcm47xx/bcma/ssb: add support for SoCs with PMU Hauke Mehrtens
2012-11-24 22:24 ` [PATCH 01/15] watchdog: bcm47xx_wdt.c: convert to watchdog core api Hauke Mehrtens
2012-11-24 22:24 ` [PATCH 02/15] watchdog: bcm47xx_wdt.c: use platform device Hauke Mehrtens
2012-11-24 22:24 ` [PATCH 03/15] watchdog: bcm47xx_wdt.c: rename ops methods Hauke Mehrtens
2012-11-24 22:24 ` [PATCH 04/15] watchdog: bcm47xx_wdt.c: rename wdt_timeout to timeout Hauke Mehrtens
2012-11-24 22:36 ` Sergei Shtylyov [this message]
2012-11-25 12:27 ` Hauke Mehrtens
2012-11-24 22:24 ` [PATCH 05/15] watchdog: bcm47xx_wdt.c: add hard timer Hauke Mehrtens
2012-11-24 22:24 ` [PATCH 06/15] bcma: add bcma_chipco_alp_clock Hauke Mehrtens
2012-11-24 22:24 ` [PATCH 07/15] bcma: set the pmu watchdog if available Hauke Mehrtens
2012-11-24 22:24 ` [PATCH 08/15] bcma: add methods for watchdog driver Hauke Mehrtens
2012-11-24 22:24 ` [PATCH 09/15] bcma: register " Hauke Mehrtens
2012-11-24 22:24 ` [PATCH 10/15] ssb: get alp clock from devices with PMU Hauke Mehrtens
2012-11-24 22:24 ` [PATCH 11/15] ssb: set the pmu watchdog if available Hauke Mehrtens
2012-11-24 22:24 ` [PATCH 12/15] ssb: add methods for watchdog driver Hauke Mehrtens
2012-11-24 22:24 ` [PATCH 13/15] ssb: extif: add check for max value in watchdog Hauke Mehrtens
2012-11-24 22:24 ` [PATCH 14/15] ssb: extif: add methods for watchdog driver Hauke Mehrtens
2012-11-24 22:24 ` [PATCH 15/15] ssb: register " Hauke Mehrtens
2012-11-26 19:24 ` [PATCH 00/15] watchdog/bcm47xx/bcma/ssb: add support for SoCs with PMU John W. Linville
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=50B14BD6.8050302@mvista.com \
--to=sshtylyov@mvista.com \
--cc=biblbroks@sezampro.rs \
--cc=castet.matthieu@free.fr \
--cc=hauke@hauke-m.de \
--cc=linux-mips@linux-mips.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.com \
--cc=m@bues.ch \
--cc=wim@iguana.be \
--cc=zajec5@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).