[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date: Tue, 3 Mar 2020 13:25:12 -0800
From: Guenter Roeck <linux@...ck-us.net>
To: Tomer Maimon <tmaimon77@...il.com>
Cc: wim@...ux-watchdog.org, robh+dt@...nel.org, mark.rutland@....com,
joel@....id.au, avifishman70@...il.com, tali.perry1@...il.com,
yuenn@...gle.com, benjaminfair@...gle.com,
linux-watchdog@...r.kernel.org, devicetree@...r.kernel.org,
linux-kernel@...r.kernel.org, openbmc@...ts.ozlabs.org
Subject: Re: [PATCH v2 3/3] watchdog: npcm: remove whitespaces
On Tue, Mar 03, 2020 at 12:01:14PM +0200, Tomer Maimon wrote:
> Signed-off-by: Tomer Maimon <tmaimon77@...il.com>
Turns out this problem does not actually exist in the upstream driver
(as of v5.6-rc4). You might want to align your code with the upstream
kernel.
Guenter
> ---
> drivers/watchdog/npcm_wdt.c | 19 +++++++++----------
> 1 file changed, 9 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/watchdog/npcm_wdt.c b/drivers/watchdog/npcm_wdt.c
> index 84a728af6664..bd38bf1ee6a1 100644
> --- a/drivers/watchdog/npcm_wdt.c
> +++ b/drivers/watchdog/npcm_wdt.c
> @@ -123,30 +123,29 @@ static int npcm_wdt_stop(struct watchdog_device *wdd)
> return 0;
> }
>
> -
> static int npcm_wdt_set_timeout(struct watchdog_device *wdd,
> unsigned int timeout)
> {
> if (timeout < 2)
> wdd->timeout = 1;
> else if (timeout < 3)
> - wdd->timeout = 2;
> + wdd->timeout = 2;
> else if (timeout < 6)
> - wdd->timeout = 5;
> + wdd->timeout = 5;
> else if (timeout < 11)
> - wdd->timeout = 10;
> + wdd->timeout = 10;
> else if (timeout < 22)
> - wdd->timeout = 21;
> + wdd->timeout = 21;
> else if (timeout < 44)
> - wdd->timeout = 43;
> + wdd->timeout = 43;
> else if (timeout < 87)
> - wdd->timeout = 86;
> + wdd->timeout = 86;
> else if (timeout < 173)
> - wdd->timeout = 172;
> + wdd->timeout = 172;
> else if (timeout < 688)
> - wdd->timeout = 687;
> + wdd->timeout = 687;
> else
> - wdd->timeout = 2750;
> + wdd->timeout = 2750;
>
> if (watchdog_active(wdd))
> npcm_wdt_start(wdd);
Powered by blists - more mailing lists