From patchwork Fri Feb 9 19:27:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcus Folkesson X-Patchwork-Id: 10209881 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id CA99E60245 for ; Fri, 9 Feb 2018 19:29:03 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B8B272960C for ; Fri, 9 Feb 2018 19:29:03 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ACD2A29629; Fri, 9 Feb 2018 19:29:03 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 0ED5D2960C for ; Fri, 9 Feb 2018 19:29:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=4BruaoMDq93GObWZsucmM08m7zXnxfK2qIE9j3lb4pU=; b=WGrWXGXpLXVXX6rbV5+qudsqdA a4qRQwGzL8Sc7jiGYrNUczl/xX7iBbtlHGcS0pmClKL1NBrP6tMZMyLjiHxj/J5/DA2TnzpkfNHmS kWiW+931eWm3llJmCrU+38/Y33Vk124goutB+muB8iV8ZVa3YloB/6RmZsBfJo4eaFma+Stlhutcm yjOaeKhAYsQuC2Zk7LMmmDaDtRyIivMZPMisxS2QD94OA5T6RT8cG5nkFO70OR+RePyykSmtzxjoC CRc3WjKOQBenfRsmLG062De+fjILpu41eRsNlsXWutpvUOe5pYoiYNgMEGC39MLxlfOFwsO3bVCy2 YCHm5erQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1ekEM0-0002UH-Kj; Fri, 09 Feb 2018 19:29:00 +0000 Received: from mail-lf0-x243.google.com ([2a00:1450:4010:c07::243]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1ekELE-0001eH-K2; Fri, 09 Feb 2018 19:28:14 +0000 Received: by mail-lf0-x243.google.com with SMTP id a25so3387776lfg.10; Fri, 09 Feb 2018 11:28:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RMdvvcme+xop+XoxoOT+5P0/VGV88FUrTvhRZpNSRds=; b=h2roXIaRAUxG/A8llUk7DFRRtYPuLSaSeamVOzZ/2WCDUci6ANwyUuGh54yEOTP2oI l4DmcNE/aISeXE4Yx34cnsayI0ItHPRBACC3LrErk1neWnVnjH/4b7BB3a0atoJ1iyhS VQs9KeoXGo7rLRoZt3XEZ77ghJz7E/4yNC6FAIZ08BntzUOZNV6gnKKADygo0P3NcJav 2nlv65LztEa2AfbZn/AVpXMn/O0BXpKApFvgwl8Bu/FRr9AbXpYQDGowVCx8P5Tx6bpo 3nzfe88tNQfo6xb0Sg7Y/9GX2STdsCsUm3GotJXuiC/Zlj+WYP6J9bXpsMdZNtsWXVl3 TdDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=RMdvvcme+xop+XoxoOT+5P0/VGV88FUrTvhRZpNSRds=; b=Ai9yJpEYhFXiSEGGmljpMYLFoPnWVE1hIp81z9U4xvEnUuGucbMzT981ChEnC2tPv3 ztPHkNDOQUt3UEebRyl5hs6YsHUsuJShKnISSCx0hsFGusBSjwsFkTdibS+l/ItF/JK7 WD+cV1hXMj9/+x7EvzDUbESdrY3DOFaP9I506Y9ow5AWc9H8b/vwfv10Qwm1MkPrBlSA kBpCqZqUXbZZi0WvZoLNbQNjAqyQ+EMgHtiBnDvtgwnS1PzoU3OHRDrWaY5H6Jp9QosJ PUbGvK3YqcCwLIcoAFRZorFPX9PJw4dViBYZP+7AiaHMcO+qvXzB9JK+FjVZaVjDKEPM cIsQ== X-Gm-Message-State: APf1xPAL8Sa19I6N0tgvLxqhTDf9Xmd3/RdnbYIwnqkXUV6QVjl0V5gb NZrZw0oL7gE+L+ZYg3dJNM4= X-Google-Smtp-Source: AH8x225lzLwyV28iInDZa8KyIOlnEKDxH3uiTUjcMwiLKvQNoa5OKUSZ6PTliEJuL4TP2e7jUriiNw== X-Received: by 10.25.44.147 with SMTP id s141mr2477704lfs.15.1518204480283; Fri, 09 Feb 2018 11:28:00 -0800 (PST) Received: from localhost.localdomain (c-2ec27091-74736162.cust.telenor.se. [46.194.112.145]) by smtp.gmail.com with ESMTPSA id e21sm570315lfb.51.2018.02.09.11.27.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Feb 2018 11:27:59 -0800 (PST) From: Marcus Folkesson To: Wim Van Sebroeck , Guenter Roeck , Rob Herring , Mark Rutland , Carlo Caione , Kevin Hilman , Matthias Brugger , Barry Song , Maxime Ripard , Chen-Yu Tsai , Linus Walleij , Vladimir Zapolskiy , Sylvain Lemieux , Nicolas Ferre , Alexandre Belloni Subject: [PATCH 1/7] watchdog: sama5d4: make use of timeout-secs provided in devicetree Date: Fri, 9 Feb 2018 20:27:18 +0100 Message-Id: <20180209192724.1227-2-marcus.folkesson@gmail.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180209192724.1227-1-marcus.folkesson@gmail.com> References: <20180209192724.1227-1-marcus.folkesson@gmail.com> X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Marcus Folkesson , linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, linux-mediatek@lists.infradead.org, linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP watchdog_init_timeout() will allways pick timeout_param since it defaults to a valid timeout. Following best practice described in Documentation/watchdog/watchdog-kernel-api.txt to make use of the parameter logic. Signed-off-by: Marcus Folkesson Reviewed-by: Guenter Roeck --- drivers/watchdog/sama5d4_wdt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/watchdog/sama5d4_wdt.c b/drivers/watchdog/sama5d4_wdt.c index 0ae947c3d7bc..e6c679383734 100644 --- a/drivers/watchdog/sama5d4_wdt.c +++ b/drivers/watchdog/sama5d4_wdt.c @@ -33,7 +33,7 @@ struct sama5d4_wdt { unsigned long last_ping; }; -static int wdt_timeout = WDT_DEFAULT_TIMEOUT; +static int wdt_timeout; static bool nowayout = WATCHDOG_NOWAYOUT; module_param(wdt_timeout, int, 0); @@ -212,7 +212,7 @@ static int sama5d4_wdt_probe(struct platform_device *pdev) return -ENOMEM; wdd = &wdt->wdd; - wdd->timeout = wdt_timeout; + wdd->timeout = WDT_DEFAULT_TIMEOUT; wdd->info = &sama5d4_wdt_info; wdd->ops = &sama5d4_wdt_ops; wdd->min_timeout = MIN_WDT_TIMEOUT;