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>

diff --git a/drivers/watchdog/via_wdt.c b/drivers/watchdog/via_wdt.c
index 5603e31afdab03e8d67ad97151f772b879dd015e..aa50da3ccfe3678f8a740eab41abcb61e7beefef 100644 (file)
--- 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 6c18a58cfd1751d993eaf46f63a0dc74b399784c..930cc7c87457c47515442e83546a431a800497c6 100644 (file)
--- 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;

diff --git a/include/linux/watchdog.h b/include/linux/watchdog.h
index ac40716b44e9a2a9ee1c13d1e878a195ce7215b0..1984ea61057703a4d16d89761fb7e83b80b57645 100644 (file)
--- a/include/linux/watchdog.h
+++ b/include/linux/watchdog.h
@@ -128,6 +128,12 @@ struct watchdog_device {
 #define WATCHDOG_NOWAYOUT_INIT_STATUS  0
 #endif
 
+/* Use the following function to check wether or not the watchdog is active */
+static inline bool watchdog_active(struct watchdog_device *wdd)
+{
+       return test_bit(WDOG_ACTIVE, &wdd->status);
+}
+
 /* Use the following function to set the nowayout feature */
 static inline void watchdog_set_nowayout(struct watchdog_device *wdd, bool nowayout)
 {