From patchwork Wed Feb 13 12:22:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Porcedda X-Patchwork-Id: 2135821 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id AF1FA3FCF6 for ; Wed, 13 Feb 2013 12:26:10 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1U5bNZ-0003Qf-Ju; Wed, 13 Feb 2013 12:24:01 +0000 Received: from mail-ea0-f175.google.com ([209.85.215.175]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1U5bMS-000360-Sd for linux-arm-kernel@lists.infradead.org; Wed, 13 Feb 2013 12:22:53 +0000 Received: by mail-ea0-f175.google.com with SMTP id d1so446236eab.20 for ; Wed, 13 Feb 2013 04:22:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=ke8yzM9doWphNoO1ooH6MpD2l2MvFbhYYSkToWXjEPM=; b=WsEzYhh8WqRPXHXw+0YY97hWTqcE7XbBTOMSHRfcMgLneZ6rppA/jQWh6xWM0tdVQR yVc98ftyAChWGDP1avhaGEbih3obzZqK57gGs8QRWDp84N0scyq+C8Rq7MehBYhPp1lk 4CnycNDOmNAm/3Y1agutrMf/bOotLeZjrlrNBJwbkzQ0a4wlwMJ2zi386ohcDPBjIdA0 M451sMypycjtABUX179wjB4W/+Ofg2/t8wFypRypRs/6sB+hj589rJp8mK+OzB4YQSa2 G31VeDB0Kulzi4E8YXVMkHhJ8xx5XFpriXj3MUgKSpKJvdUbjFKovXnboIroB7cNOKPm Ye0w== X-Received: by 10.14.173.67 with SMTP id u43mr4974883eel.22.1360758171528; Wed, 13 Feb 2013 04:22:51 -0800 (PST) Received: from ld2036.tmt.telital.com ([213.205.6.118]) by mx.google.com with ESMTPS id a1sm47561728eep.2.2013.02.13.04.22.49 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 13 Feb 2013 04:22:50 -0800 (PST) From: Fabio Porcedda To: Wim Van Sebroeck , linux-watchdog@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Nicolas Ferre , Jean-Christophe PLAGNIOL-VILLARD , Andrew Victor , Jason Cooper , Andrew Lunn , Ben Dooks , Kukjin Kim Subject: [PATCH v8 7/7] watchdog: orion_wdt: move the min_timeout initialization Date: Wed, 13 Feb 2013 13:22:30 +0100 Message-Id: <1360758150-23004-8-git-send-email-fabio.porcedda@gmail.com> X-Mailer: git-send-email 1.8.1.1 In-Reply-To: <1360758150-23004-1-git-send-email-fabio.porcedda@gmail.com> References: <1360758150-23004-1-git-send-email-fabio.porcedda@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130213_072253_069689_52465016 X-CRM114-Status: GOOD ( 11.43 ) X-Spam-Score: 0.3 (/) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (0.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.215.175 listed in list.dnswl.org] 3.0 KHOP_BIG_TO_CC Sent to 10+ recipients instaed of Bcc or a list 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (fabio.porcedda[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: devicetree-discuss@lists.ozlabs.org, Wenyou Yang X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Move the min_timeout initialization inside the orion_wdt definition. Only compile tested. Signed-off-by: Fabio Porcedda Cc: Andrew Lunn Acked-by: Jason Cooper --- drivers/watchdog/orion_wdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c index 3022a38..da57798 100644 --- a/drivers/watchdog/orion_wdt.c +++ b/drivers/watchdog/orion_wdt.c @@ -140,6 +140,7 @@ static const struct watchdog_ops orion_wdt_ops = { static struct watchdog_device orion_wdt = { .info = &orion_wdt_info, .ops = &orion_wdt_ops, + .min_timeout = 1, }; static int orion_wdt_probe(struct platform_device *pdev) @@ -164,7 +165,6 @@ static int orion_wdt_probe(struct platform_device *pdev) wdt_max_duration = WDT_MAX_CYCLE_COUNT / wdt_tclk; - orion_wdt.min_timeout = 1; orion_wdt.timeout = wdt_max_duration; orion_wdt.max_timeout = wdt_max_duration; watchdog_init_timeout(&orion_wdt, heartbeat, &pdev->dev);