From patchwork Thu Nov 22 12:51:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Porcedda X-Patchwork-Id: 1783731 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id 6E514DF230 for ; Thu, 22 Nov 2012 12:57:06 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TbWI6-0003UX-VN; Thu, 22 Nov 2012 12:54:03 +0000 Received: from mail-bk0-f49.google.com ([209.85.214.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TbWGY-0002pG-P1 for linux-arm-kernel@lists.infradead.org; Thu, 22 Nov 2012 12:52:27 +0000 Received: by mail-bk0-f49.google.com with SMTP id jm19so2166347bkc.36 for ; Thu, 22 Nov 2012 04:52:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=8clrNyTnytTxhtfJ5672D0fFLEXeH/6T/BmmYwfp0Pw=; b=w6JuZEcv4Tn4BIp+CXmp0+j9Q9LTuV/6ISkkMbq75L5VsBJTIzq03RPc9l77mThl+O RK2093vj8SRrmQFCc0S5DNiXr5vjL7kUQ+y2JyHM1R9sQubloU0GGnSRh07qNoa4cW4U VA35D2hB2JCaptDReNyhESbh+uhHDlxZ2AxSt+O5ImxU5aFZn9sC/RmPpYJZACAkd653 cTTfPXwfEWb8TD5DRz4Q9xsh0rKFvAuqPTrAyM17cSOFhg/C3O6ae4Y/mZ+XdS1VkEWY ov3j7hEMzr86WY1y6QGEXtsoop3vjkRJd9bgnVCf6bgC94vqawH5rxq73I0hXCUG2uoz G5XA== Received: by 10.204.129.211 with SMTP id p19mr205450bks.94.1353588745420; Thu, 22 Nov 2012 04:52:25 -0800 (PST) Received: from ld2036.tmt.telital.com ([213.205.6.118]) by mx.google.com with ESMTPS id go4sm2252054bkc.15.2012.11.22.04.52.22 (version=SSLv3 cipher=OTHER); Thu, 22 Nov 2012 04:52:24 -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 v6 6/7] watchdog: orion_wdt: move the min_timeout initialization Date: Thu, 22 Nov 2012 13:51:55 +0100 Message-Id: <1353588716-28917-7-git-send-email-fabio.porcedda@gmail.com> X-Mailer: git-send-email 1.8.0 In-Reply-To: <1353588716-28917-1-git-send-email-fabio.porcedda@gmail.com> References: <1353588716-28917-1-git-send-email-fabio.porcedda@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121122_075227_131612_1ABE10C7 X-CRM114-Status: GOOD ( 12.98 ) 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.214.49 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 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 446a3e9..3b4e228 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 __devinit orion_wdt_probe(struct platform_device *pdev) @@ -162,7 +163,6 @@ static int __devinit 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.of_node);