From patchwork Fri Jul 15 08:15:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rasmus Villemoes X-Patchwork-Id: 9231305 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 DDDDA60574 for ; Fri, 15 Jul 2016 08:16:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CDB982522B for ; Fri, 15 Jul 2016 08:16:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C19CB28307; Fri, 15 Jul 2016 08:16:44 +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.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5A1A22522B for ; Fri, 15 Jul 2016 08:16:44 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bNyHN-0007t4-Mq; Fri, 15 Jul 2016 08:15:25 +0000 Received: from mail02.prevas.se ([62.95.78.10]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bNyHE-0006MG-IE; Fri, 15 Jul 2016 08:15:19 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=prevas.dk; i=@prevas.dk; l=1142; q=dns/txt; s=ironport2; t=1468570516; x=1500106516; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version; bh=lUKI0qhopy4b+mHQX8gOpylutbldr4VnDzl0VUrdQMM=; b=ReT42O/FgM76O86TGzHltHlJazBTvhi0520qskQxxl5CLgOzT6pAvU5Q 391MRtgDeJJmwmQJ++sbdmjuNehIzO4va6B3FdKdNybRhpCT7MRL0iC/i /VQ/Eu3fqQ3bNOCme+TtRVDWJ2vgZ4z35dusY066sgFoRWsvyL207rwto A=; X-IronPort-AV: E=Sophos;i="5.28,367,1464645600"; d="scan'208";a="954649" Received: from vmprevas3.prevas.se (HELO smtp.prevas.se) ([172.16.8.103]) by ironport2.prevas.se with ESMTP/TLS/AES256-SHA; 15 Jul 2016 10:14:50 +0200 Received: from prevas-ravi.prevas.se (172.16.11.27) by smtp.prevas.se (172.16.8.105) with Microsoft SMTP Server (TLS) id 14.2.347.0; Fri, 15 Jul 2016 10:14:50 +0200 From: Rasmus Villemoes To: Wim Van Sebroeck , Guenter Roeck , Stephen Warren , Lee Jones , Eric Anholt Subject: [PATCH 2/3] watchdog: bcm2835_wdt: remove redundant ->set_timeout callback Date: Fri, 15 Jul 2016 10:15:22 +0200 Message-ID: <1468570524-18222-2-git-send-email-rasmus.villemoes@prevas.dk> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1468570524-18222-1-git-send-email-rasmus.villemoes@prevas.dk> References: <1468570524-18222-1-git-send-email-rasmus.villemoes@prevas.dk> MIME-Version: 1.0 X-Originating-IP: [172.16.11.27] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160715_011517_310541_87FB649B X-CRM114-Status: UNSURE ( 8.05 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-kernel@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-watchdog@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Rasmus Villemoes 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 bcm2835_wdt_set_timeout does exactly what the watchdog framework does in the absence of a ->set_timeout callback (see watchdog_set_timeout in watchdog_dev.c), so remove it. Signed-off-by: Rasmus Villemoes Reviewed-by: Guenter Roeck Acked-by: Eric Anholt --- drivers/watchdog/bcm2835_wdt.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c index 733e402..4dddd82 100644 --- a/drivers/watchdog/bcm2835_wdt.c +++ b/drivers/watchdog/bcm2835_wdt.c @@ -82,12 +82,6 @@ static int bcm2835_wdt_stop(struct watchdog_device *wdog) return 0; } -static int bcm2835_wdt_set_timeout(struct watchdog_device *wdog, unsigned int t) -{ - wdog->timeout = t; - return 0; -} - static unsigned int bcm2835_wdt_get_timeleft(struct watchdog_device *wdog) { struct bcm2835_wdt *wdt = watchdog_get_drvdata(wdog); @@ -100,7 +94,6 @@ static const struct watchdog_ops bcm2835_wdt_ops = { .owner = THIS_MODULE, .start = bcm2835_wdt_start, .stop = bcm2835_wdt_stop, - .set_timeout = bcm2835_wdt_set_timeout, .get_timeleft = bcm2835_wdt_get_timeleft, };