From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f194.google.com ([209.85.192.194]:41178 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752540AbeBKDyt (ORCPT ); Sat, 10 Feb 2018 22:54:49 -0500 Subject: Re: [PATCH 2/4] watchdog: omap_wdt: change order for setting default timeout To: Marcus Folkesson , Wim Van Sebroeck Cc: linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org References: <20180210203623.17832-1-marcus.folkesson@gmail.com> <20180210203623.17832-2-marcus.folkesson@gmail.com> From: Guenter Roeck Message-ID: <1e30bcff-801e-7b1f-2e1c-2645e9171826@roeck-us.net> Date: Sat, 10 Feb 2018 19:54:47 -0800 MIME-Version: 1.0 In-Reply-To: <20180210203623.17832-2-marcus.folkesson@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-watchdog-owner@vger.kernel.org List-Id: linux-watchdog@vger.kernel.org On 02/10/2018 12:36 PM, Marcus Folkesson wrote: > watchdog_init_timeout() will preserve wdd->timeout value if > no parameter nor timeout-secs dt property is set. > > Signed-off-by: Marcus Folkesson Reviewed-by: Guenter Roeck > --- > drivers/watchdog/omap_wdt.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/watchdog/omap_wdt.c b/drivers/watchdog/omap_wdt.c > index 1b02bfa81b29..ae77112ce97f 100644 > --- a/drivers/watchdog/omap_wdt.c > +++ b/drivers/watchdog/omap_wdt.c > @@ -253,10 +253,10 @@ static int omap_wdt_probe(struct platform_device *pdev) > wdev->wdog.ops = &omap_wdt_ops; > wdev->wdog.min_timeout = TIMER_MARGIN_MIN; > wdev->wdog.max_timeout = TIMER_MARGIN_MAX; > + wdev->wdog.timeout = TIMER_MARGIN_DEFAULT; > wdev->wdog.parent = &pdev->dev; > > - if (watchdog_init_timeout(&wdev->wdog, timer_margin, &pdev->dev) < 0) > - wdev->wdog.timeout = TIMER_MARGIN_DEFAULT; > + watchdog_init_timeout(&wdev->wdog, timer_margin, &pdev->dev); > > watchdog_set_nowayout(&wdev->wdog, nowayout); > >