aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuenter Roeck <linux@roeck-us.net>2016-07-17 18:04:12 -0400
committerWim Van Sebroeck <wim@iguana.be>2016-07-19 04:09:12 -0400
commite035d8f787b1de664fcac5eb84643f8c374284c4 (patch)
tree6f1390f992e670d0080c4b0726ccdba91b055ad7
parent90b826f17a4e1c4ff2b3ef69512a6409e94f4d64 (diff)
watchdog: sbsa: Drop status function
The watchdog status function is supposed to return WDIOF_ flags, not internal status flags. The available WDIOF_ flags are now returned by the watchdog core, so the status function in this driver is unnecessary. Signed-off-by: Guenter Roeck <linux@roeck-us.net> Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
-rw-r--r--drivers/watchdog/sbsa_gwdt.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c
index cc885f1c1850..ce0c38bd0f00 100644
--- a/drivers/watchdog/sbsa_gwdt.c
+++ b/drivers/watchdog/sbsa_gwdt.c
@@ -180,15 +180,6 @@ static int sbsa_gwdt_keepalive(struct watchdog_device *wdd)
180 return 0; 180 return 0;
181} 181}
182 182
183static unsigned int sbsa_gwdt_status(struct watchdog_device *wdd)
184{
185 struct sbsa_gwdt *gwdt = watchdog_get_drvdata(wdd);
186 u32 status = readl(gwdt->control_base + SBSA_GWDT_WCS);
187
188 /* is the watchdog timer running? */
189 return (status & SBSA_GWDT_WCS_EN) << WDOG_ACTIVE;
190}
191
192static int sbsa_gwdt_start(struct watchdog_device *wdd) 183static int sbsa_gwdt_start(struct watchdog_device *wdd)
193{ 184{
194 struct sbsa_gwdt *gwdt = watchdog_get_drvdata(wdd); 185 struct sbsa_gwdt *gwdt = watchdog_get_drvdata(wdd);
@@ -228,7 +219,6 @@ static struct watchdog_ops sbsa_gwdt_ops = {
228 .owner = THIS_MODULE, 219 .owner = THIS_MODULE,
229 .start = sbsa_gwdt_start, 220 .start = sbsa_gwdt_start,
230 .stop = sbsa_gwdt_stop, 221 .stop = sbsa_gwdt_stop,
231 .status = sbsa_gwdt_status,
232 .ping = sbsa_gwdt_keepalive, 222 .ping = sbsa_gwdt_keepalive,
233 .set_timeout = sbsa_gwdt_set_timeout, 223 .set_timeout = sbsa_gwdt_set_timeout,
234 .get_timeleft = sbsa_gwdt_get_timeleft, 224 .get_timeleft = sbsa_gwdt_get_timeleft,