From patchwork Tue Oct 9 12:04:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Porcedda X-Patchwork-Id: 1569831 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 7F80340135 for ; Tue, 9 Oct 2012 12:08:39 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TLYZo-00027Z-LX; Tue, 09 Oct 2012 12:06:20 +0000 Received: from mail-ee0-f49.google.com ([74.125.83.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TLYY2-00018h-69 for linux-arm-kernel@lists.infradead.org; Tue, 09 Oct 2012 12:04:31 +0000 Received: by mail-ee0-f49.google.com with SMTP id c1so3282973eek.36 for ; Tue, 09 Oct 2012 05:04:29 -0700 (PDT) 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=FjEF3SKkFkeBR71xBv9bCUp5gZSeJ5i6Uhh06N7ipaw=; b=DfriR4sDspp2AwINlWBYhMcGr4dswO3i3kRJ7HCnSReFo7Ery/pnlR4PiLAK88qVAZ KafcJUiMNmDQRZeXgpL/RyAcMNDOZpsuuRjIzt4omTs/edGCe0xnQbF3fe0unxaA7j0l 2ldJdOhU2yKoIMt/JV/gcCNRLPBkVjz1pQO9cUpsQcb2gZc72CS0TORnkgC4Ac37+itG es+uTPgEypjFHbNXAmedN+Thv8NZbxV9TCNdRlzbTp0RFRc0AAYL2dcI+1j3ua3gjCzA glvR/Pvvnd0Y5lM5VXmA+uUsIylzlEMDI+YwoS9DE8O054UpcLieBaGDsa7JcgTswqmt PZUQ== Received: by 10.14.184.134 with SMTP id s6mr26819138eem.46.1349784269868; Tue, 09 Oct 2012 05:04:29 -0700 (PDT) Received: from ld2036.tmt.telital.com ([213.205.6.118]) by mx.google.com with ESMTPS id i41sm33975995eem.7.2012.10.09.05.04.28 (version=SSLv3 cipher=OTHER); Tue, 09 Oct 2012 05:04:29 -0700 (PDT) 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 v4 7/8] watchdog: orion_wdt: move the min_timeout initialization Date: Tue, 9 Oct 2012 14:04:10 +0200 Message-Id: <1349784251-28261-8-git-send-email-fabio.porcedda@gmail.com> X-Mailer: git-send-email 1.7.11.3 In-Reply-To: <1349784251-28261-1-git-send-email-fabio.porcedda@gmail.com> References: <1349784251-28261-1-git-send-email-fabio.porcedda@gmail.com> X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.7 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.83.49 listed in list.dnswl.org] 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: Jason Cooper Cc: Andrew Lunn --- 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);