Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752080AbbDENEH (ORCPT ); Sun, 5 Apr 2015 09:04:07 -0400 Received: from bh-25.webhostbox.net ([208.91.199.152]:56914 "EHLO bh-25.webhostbox.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751721AbbDENEE (ORCPT ); Sun, 5 Apr 2015 09:04:04 -0400 Message-ID: <552132B1.1080402@roeck-us.net> Date: Sun, 05 Apr 2015 06:03:45 -0700 From: Guenter Roeck User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: Andrew Bresticker , Wim Van Sebroeck CC: linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, Ezequiel Garcia , James Hogan Subject: Re: [PATCH V3 1/3] watchdog: imgpdc: Allow timeout to be set in device-tree References: <1428080722-29683-1-git-send-email-abrestic@chromium.org> In-Reply-To: <1428080722-29683-1-git-send-email-abrestic@chromium.org> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-Authenticated_sender: linux@roeck-us.net X-OutGoing-Spam-Status: No, score=-1.0 X-CTCH-PVer: 0000001 X-CTCH-Spam: Unknown X-CTCH-VOD: Unknown X-CTCH-Flags: 0 X-CTCH-RefID: str=0001.0A020205.552132C2.0213,ss=1,re=0.001,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0 X-CTCH-Score: 0.001 X-CTCH-ScoreCust: 0.000 X-CTCH-Rules: C_4847, X-CTCH-SenderID: linux@roeck-us.net X-CTCH-SenderID-Flags: 0 X-CTCH-SenderID-TotalMessages: 3 X-CTCH-SenderID-TotalSpam: 0 X-CTCH-SenderID-TotalSuspected: 0 X-CTCH-SenderID-TotalConfirmed: 0 X-CTCH-SenderID-TotalBulk: 0 X-CTCH-SenderID-TotalVirus: 0 X-CTCH-SenderID-TotalRecipients: 0 X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - bh-25.webhostbox.net X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - roeck-us.net X-Get-Message-Sender-Via: bh-25.webhostbox.net: mailgid no entry from get_relayhosts_entry X-Source: X-Source-Args: X-Source-Dir: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2308 Lines: 60 On 04/03/2015 10:05 AM, Andrew Bresticker wrote: > Since the heartbeat is statically initialized to its default value, > watchdog_init_timeout() will never look in the device-tree for a > timeout-sec value. Instead of statically initializing heartbeat, > fall back to the default timeout value if watchdog_init_timeout() > fails. > > Signed-off-by: Andrew Bresticker > Cc: Ezequiel Garcia > Cc: James Hogan Reviewed-by: Guenter Roeck > --- > Changes from v2: > - Set timeout before calling watchdog_init_timeout > - Don't print an error on watchdog_init_timeout failure > New for v2. > --- > drivers/watchdog/imgpdc_wdt.c | 10 +++------- > 1 file changed, 3 insertions(+), 7 deletions(-) > > diff --git a/drivers/watchdog/imgpdc_wdt.c b/drivers/watchdog/imgpdc_wdt.c > index 0deaa4f..d6826a6 100644 > --- a/drivers/watchdog/imgpdc_wdt.c > +++ b/drivers/watchdog/imgpdc_wdt.c > @@ -42,7 +42,7 @@ > #define PDC_WDT_MIN_TIMEOUT 1 > #define PDC_WDT_DEF_TIMEOUT 64 > > -static int heartbeat = PDC_WDT_DEF_TIMEOUT; > +static int heartbeat; > module_param(heartbeat, int, 0); > MODULE_PARM_DESC(heartbeat, "Watchdog heartbeats in seconds " > "(default=" __MODULE_STRING(PDC_WDT_DEF_TIMEOUT) ")"); > @@ -190,15 +190,11 @@ static int pdc_wdt_probe(struct platform_device *pdev) > pdc_wdt->wdt_dev.info = &pdc_wdt_info; > pdc_wdt->wdt_dev.ops = &pdc_wdt_ops; > pdc_wdt->wdt_dev.max_timeout = 1 << PDC_WDT_CONFIG_DELAY_MASK; > + pdc_wdt->wdt_dev.timeout = PDC_WDT_DEF_TIMEOUT; > pdc_wdt->wdt_dev.parent = &pdev->dev; > watchdog_set_drvdata(&pdc_wdt->wdt_dev, pdc_wdt); > > - ret = watchdog_init_timeout(&pdc_wdt->wdt_dev, heartbeat, &pdev->dev); > - if (ret < 0) { > - pdc_wdt->wdt_dev.timeout = pdc_wdt->wdt_dev.max_timeout; > - dev_warn(&pdev->dev, > - "Initial timeout out of range! setting max timeout\n"); > - } > + watchdog_init_timeout(&pdc_wdt->wdt_dev, heartbeat, &pdev->dev); > > pdc_wdt_stop(&pdc_wdt->wdt_dev); > > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/