aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRasmus Villemoes <rasmus.villemoes@prevas.dk>2016-07-15 04:15:22 -0400
committerWim Van Sebroeck <wim@iguana.be>2016-07-17 15:03:50 -0400
commit960ae4ea776e160b3c47dc4b461e6f42ef2f659a (patch)
tree1d55f774246744fb5eb00a7059364394d1de3b86
parentaea4b477b96a1e098bdd39a7503eb4163cf65dbb (diff)
watchdog: bcm2835_wdt: remove redundant ->set_timeout callback
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> Reviewed-by: Guenter Roeck <linux@roeck-us.net> Acked-by: Eric Anholt <eric@anholt.net> Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
-rw-r--r--drivers/watchdog/bcm2835_wdt.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/drivers/watchdog/bcm2835_wdt.c b/drivers/watchdog/bcm2835_wdt.c
index 733e402e80d7..4dddd8298a22 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)
82 return 0; 82 return 0;
83} 83}
84 84
85static int bcm2835_wdt_set_timeout(struct watchdog_device *wdog, unsigned int t)
86{
87 wdog->timeout = t;
88 return 0;
89}
90
91static unsigned int bcm2835_wdt_get_timeleft(struct watchdog_device *wdog) 85static unsigned int bcm2835_wdt_get_timeleft(struct watchdog_device *wdog)
92{ 86{
93 struct bcm2835_wdt *wdt = watchdog_get_drvdata(wdog); 87 struct bcm2835_wdt *wdt = watchdog_get_drvdata(wdog);
@@ -100,7 +94,6 @@ static const struct watchdog_ops bcm2835_wdt_ops = {
100 .owner = THIS_MODULE, 94 .owner = THIS_MODULE,
101 .start = bcm2835_wdt_start, 95 .start = bcm2835_wdt_start,
102 .stop = bcm2835_wdt_stop, 96 .stop = bcm2835_wdt_stop,
103 .set_timeout = bcm2835_wdt_set_timeout,
104 .get_timeleft = bcm2835_wdt_get_timeleft, 97 .get_timeleft = bcm2835_wdt_get_timeleft,
105}; 98};
106 99