From patchwork Tue Mar 5 20:19:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Packham X-Patchwork-Id: 10840095 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7F04A180E for ; Tue, 5 Mar 2019 20:19:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 979D82CAC7 for ; Tue, 5 Mar 2019 20:19:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8BAED2CACA; Tue, 5 Mar 2019 20:19:36 +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=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 934BA2CAC7 for ; Tue, 5 Mar 2019 20:19:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727983AbfCEUTf (ORCPT ); Tue, 5 Mar 2019 15:19:35 -0500 Received: from gate2.alliedtelesis.co.nz ([202.36.163.20]:55859 "EHLO gate2.alliedtelesis.co.nz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728622AbfCEUTf (ORCPT ); Tue, 5 Mar 2019 15:19:35 -0500 Received: from mmarshal3.atlnz.lc (mmarshal3.atlnz.lc [10.32.18.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by gate2.alliedtelesis.co.nz (Postfix) with ESMTPS id C97A9891AA; Wed, 6 Mar 2019 09:19:32 +1300 (NZDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=alliedtelesis.co.nz; s=mail181024; t=1551817172; bh=7BaeZd54UA75pFPzRyMdWlNw1ciq4AymcW/Yk7re/Qw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=wDbN53zh+RBYGa11sreZjALrSY4S0wtf35/DvBv8LpjVsaSMHBGU3qH25ciYWwt72 D2cRiBLXVJGSXMf0u/19sJnGHCpoO3goX+wAImStrO0s06E2MkX9zjceKjAIqX6yk6 7SB1LywwuRVTSJF2lxBN4I3/vWDXWpsmLA1GDvpuMc3tlLxr2cAn9xC+lpxvRLb2Gz OIWzJcdayHFZJmXc7B0Tw73ssIv4kFB585SeSvbRRx8OVIqP/9ixyPZJmXjYPCKPRt 2S/PkyFOWfMrFkqTZl78BNzy8oAHSlXg1Kv5loavU2sp+p1rQyRgotcYiC3qr6P6Z0 9oXgC8yk53cMw== Received: from smtp (Not Verified[10.32.16.33]) by mmarshal3.atlnz.lc with Trustwave SEG (v7,5,8,10121) id ; Wed, 06 Mar 2019 09:19:32 +1300 Received: from chrisp-dl.ws.atlnz.lc (chrisp-dl.ws.atlnz.lc [10.33.22.30]) by smtp (Postfix) with ESMTP id D16B513EF3B; Wed, 6 Mar 2019 09:19:32 +1300 (NZDT) Received: by chrisp-dl.ws.atlnz.lc (Postfix, from userid 1030) id 9C7F71E1D96; Wed, 6 Mar 2019 09:19:32 +1300 (NZDT) From: Chris Packham To: jason@lakedaemon.net, andrew@lunn.ch, gregory.clement@bootlin.com, linux@roeck-us.net Cc: linux-watchdog@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, Chris Packham , Wim Van Sebroeck Subject: [PATCH v2 2/3] watchdog: orion: remove orion_wdt_set_timeout Date: Wed, 6 Mar 2019 09:19:23 +1300 Message-Id: <20190305201924.14853-3-chris.packham@alliedtelesis.co.nz> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190305201924.14853-1-chris.packham@alliedtelesis.co.nz> References: <20190305201924.14853-1-chris.packham@alliedtelesis.co.nz> MIME-Version: 1.0 x-atlnz-ls: pat Sender: linux-watchdog-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The watchdog core will do the same thing if no set_timeout is supplied so we can safely remove orion_wdt_set_timeout. Signed-off-by: Chris Packham Reviewed-by: Guenter Roeck --- Changes in v2: - Add Guenter's review drivers/watchdog/orion_wdt.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/watchdog/orion_wdt.c b/drivers/watchdog/orion_wdt.c index 9db3b09f7568..8b259c712c52 100644 --- a/drivers/watchdog/orion_wdt.c +++ b/drivers/watchdog/orion_wdt.c @@ -349,13 +349,6 @@ static unsigned int orion_wdt_get_timeleft(struct watchdog_device *wdt_dev) return readl(dev->reg + dev->data->wdt_counter_offset) / dev->clk_rate; } -static int orion_wdt_set_timeout(struct watchdog_device *wdt_dev, - unsigned int timeout) -{ - wdt_dev->timeout = timeout; - return 0; -} - static const struct watchdog_info orion_wdt_info = { .options = WDIOF_SETTIMEOUT | WDIOF_KEEPALIVEPING | WDIOF_MAGICCLOSE, .identity = "Orion Watchdog", @@ -366,7 +359,6 @@ static const struct watchdog_ops orion_wdt_ops = { .start = orion_wdt_start, .stop = orion_wdt_stop, .ping = orion_wdt_ping, - .set_timeout = orion_wdt_set_timeout, .get_timeleft = orion_wdt_get_timeleft, };