lkml.org 
[lkml]   [2019]   [Apr]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH v3 06/16] watchdog: hpwdt: drop warning after calling watchdog_init_timeout
On Fri, Apr 19, 2019 at 08:15:51PM +0200, Wolfram Sang wrote:
> The core will print out details now.
>
> Reviewed-by: Guenter Roeck <linux@roeck-us.net>
> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> ---
> drivers/watchdog/hpwdt.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)

Applied patches 1,2, and 6. Messages are well formed when soft_margin
is out of range.

Tested-by: Jerry Hoemann <jerry.hoemann@hpe.com>


>
> diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c
> index ef30c7e9728d..db1bf6f546ae 100644
> --- a/drivers/watchdog/hpwdt.c
> +++ b/drivers/watchdog/hpwdt.c
> @@ -311,8 +311,7 @@ static int hpwdt_init_one(struct pci_dev *dev,
> goto error_init_nmi_decoding;
>
> watchdog_set_nowayout(&hpwdt_dev, nowayout);
> - if (watchdog_init_timeout(&hpwdt_dev, soft_margin, NULL))
> - dev_warn(&dev->dev, "Invalid soft_margin: %d.\n", soft_margin);
> + watchdog_init_timeout(&hpwdt_dev, soft_margin, NULL);
>
> if (pretimeout && hpwdt_dev.timeout <= PRETIMEOUT_SEC) {
> dev_warn(&dev->dev, "timeout <= pretimeout. Setting pretimeout to zero\n");
> --
> 2.11.0

--

-----------------------------------------------------------------------------
Jerry Hoemann Software Engineer Hewlett Packard Enterprise
-----------------------------------------------------------------------------

\
 
 \ /
  Last update: 2019-04-19 23:21    [W:0.047 / U:1.108 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site