Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1444044

[PATCH 2/3] watchdog: bcm2835_wdt: remove redundant ->set_timeout callback

From Rasmus Villemoes <rasmus.villemoes@prevas.dk>
Newsgroups linux.kernel
Subject [PATCH 2/3] watchdog: bcm2835_wdt: remove redundant ->set_timeout callback
Date 2016-07-15 10:20 +0200
Message-ID <rV6vM-4wu-37@gated-at.bofh.it> (permalink)
References <rV6vM-4wu-23@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


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 <rasmus.villemoes@prevas.dk>
---
 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

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH 1/3] watchdog: bcm2835_wdt: constify _ops and _info structures Rasmus Villemoes <rasmus.villemoes@prevas.dk> - 2016-07-15 10:20 +0200
  [PATCH 3/3] watchdog: bcm2835_wdt: set WDOG_HW_RUNNING bit when appropriate Rasmus Villemoes <rasmus.villemoes@prevas.dk> - 2016-07-15 10:20 +0200
    Re: [PATCH 3/3] watchdog: bcm2835_wdt: set WDOG_HW_RUNNING bit when  appropriate Guenter Roeck <linux@roeck-us.net> - 2016-07-15 15:50 +0200
      Re: [PATCH 3/3] watchdog: bcm2835_wdt: set WDOG_HW_RUNNING bit when  appropriate Rasmus Villemoes <rasmus.villemoes@prevas.dk> - 2016-07-20 23:40 +0200
        Re: [PATCH 3/3] watchdog: bcm2835_wdt: set WDOG_HW_RUNNING bit when  appropriate Guenter Roeck <linux@roeck-us.net> - 2016-07-21 01:50 +0200
  [PATCH 2/3] watchdog: bcm2835_wdt: remove redundant ->set_timeout callback Rasmus Villemoes <rasmus.villemoes@prevas.dk> - 2016-07-15 10:20 +0200
    Re: [PATCH 2/3] watchdog: bcm2835_wdt: remove redundant ->set_timeout  callback Guenter Roeck <linux@roeck-us.net> - 2016-07-15 15:50 +0200
    Re: [PATCH 2/3] watchdog: bcm2835_wdt: remove redundant ->set_timeout callback Eric Anholt <eric@anholt.net> - 2016-07-15 21:00 +0200
    Re: [PATCH 2/3] watchdog: bcm2835_wdt: remove redundant ->set_timeout callback Wim Van Sebroeck <wim@iguana.be> - 2016-07-17 22:30 +0200
  Re: [PATCH 1/3] watchdog: bcm2835_wdt: constify _ops and _info  structures Guenter Roeck <linux@roeck-us.net> - 2016-07-15 15:50 +0200
  Re: [PATCH 1/3] watchdog: bcm2835_wdt: constify _ops and _info structures Wim Van Sebroeck <wim@iguana.be> - 2016-07-17 22:30 +0200

csiph-web