From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751590AbcGQU1N (ORCPT ); Sun, 17 Jul 2016 16:27:13 -0400 Received: from spo001.leaseweb.nl ([83.149.101.17]:43849 "EHLO spo001.leaseweb.nl" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1751528AbcGQU1L (ORCPT ); Sun, 17 Jul 2016 16:27:11 -0400 Date: Sun, 17 Jul 2016 22:27:02 +0200 From: Wim Van Sebroeck To: Rasmus Villemoes Cc: Guenter Roeck , Stephen Warren , Lee Jones , Eric Anholt , linux-watchdog@vger.kernel.org, linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/3] watchdog: bcm2835_wdt: remove redundant ->set_timeout callback Message-ID: <20160717202702.GF916@spo001.leaseweb.nl> References: <1468570524-18222-1-git-send-email-rasmus.villemoes@prevas.dk> <1468570524-18222-2-git-send-email-rasmus.villemoes@prevas.dk> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1468570524-18222-2-git-send-email-rasmus.villemoes@prevas.dk> User-Agent: Mutt/1.4.1i Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Rasmus, > 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 > --- > 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, > }; > > -- > 2.5.0 > This patch has been added to linux-watchdog-next. Kind regards, Wim.