watchdog: Add watchdog_active() routine

Some watchdog may need to check if watchdog is ACTIVE or not, for example in
their suspend/resume hooks.

This patch adds this routine and changes the core drivers to use it.

Signed-off-by: Viresh Kumar <viresh.kumar@st.com>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>

2 files changed, 4 insertions, 4 deletions

diff --git a/drivers/watchdog/via_wdt.c b/drivers/watchdog/via_wdt.c
index 5603e31afdab..aa50da3ccfe3 100644
--- a/drivers/watchdog/via_wdt.c
+++ b/drivers/watchdog/via_wdt.c
@@ -91,7 +91,7 @@ static inline void wdt_reset(void)
 static void wdt_timer_tick(unsigned long data)
 {
         if (time_before(jiffies, next_heartbeat) ||
-           (!test_bit(WDOG_ACTIVE, &wdt_dev.status))) {
+           (!watchdog_active(&wdt_dev))) {
                 wdt_reset();
                 mod_timer(&timer, jiffies + WDT_HEARTBEAT);
         } else
diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c
index 6c18a58cfd17..930cc7c87457 100644
--- a/drivers/watchdog/watchdog_dev.c
+++ b/drivers/watchdog/watchdog_dev.c
@@ -61,7 +61,7 @@ static struct watchdog_device *wdd;
 
 static int watchdog_ping(struct watchdog_device *wddev)
 {
-        if (test_bit(WDOG_ACTIVE, &wddev->status)) {
+        if (watchdog_active(wddev)) {
                 if (wddev->ops->ping)
                         return wddev->ops->ping(wddev);  /* ping the watchdog */
                 else
@@ -83,7 +83,7 @@ static int watchdog_start(struct watchdog_device *wddev)
 {
         int err;
 
-        if (!test_bit(WDOG_ACTIVE, &wddev->status)) {
+        if (!watchdog_active(wddev)) {
                 err = wddev->ops->start(wddev);
                 if (err < 0)
                         return err;
@@ -113,7 +113,7 @@ static int watchdog_stop(struct watchdog_device *wddev)
                 return err;
         }
 
-        if (test_bit(WDOG_ACTIVE, &wddev->status)) {
+        if (watchdog_active(wddev)) {
                 err = wddev->ops->stop(wddev);
                 if (err < 0)
                         return err;