[PATCH 2/3] watchdog: rename timeout_curr to poller_timeout_curr internally

[Ahmad Fatoum]

timeout_curr is the timeout programmed into the watchdog hardware every
500 milliseconds. If watchdog poller support is disabled, it serves
no purpose, prefix it with poller_ to better communicate this fact.

No functional change.

Signed-off-by: Ahmad Fatoum <a.fat...@pengutronix.de>
---
 drivers/watchdog/wd_core.c | 10 +++++-----
 include/watchdog.h         |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/watchdog/wd_core.c b/drivers/watchdog/wd_core.c
index e6e5ddecd2f8..5b984db8586a 100644
--- a/drivers/watchdog/wd_core.c
+++ b/drivers/watchdog/wd_core.c
@@ -45,7 +45,7 @@ static int watchdog_set_cur(struct param_d *param, void *priv)
 {
        struct watchdog *wd = priv;
 
-       if (wd->timeout_cur > wd->timeout_max)
+       if (wd->poller_timeout_cur > wd->timeout_max)
                return -EINVAL;
 
        return 0;
@@ -55,7 +55,7 @@ static void watchdog_poller_cb(void *priv);
 
 static void watchdog_poller_start(struct watchdog *wd)
 {
-       _watchdog_set_timeout(wd, wd->timeout_cur);
+       _watchdog_set_timeout(wd, wd->poller_timeout_cur);
        poller_call_async(&wd->poller, 500 * MSECOND,
                        watchdog_poller_cb, wd);
 
@@ -134,8 +134,8 @@ int watchdog_register(struct watchdog *wd)
        if (!wd->timeout_max)
                wd->timeout_max = 60 * 60 * 24;
 
-       if (!wd->timeout_cur || wd->timeout_cur > wd->timeout_max)
-               wd->timeout_cur = wd->timeout_max;
+       if (!wd->poller_timeout_cur || wd->poller_timeout_cur > wd->timeout_max)
+               wd->poller_timeout_cur = wd->timeout_max;
 
        p = dev_add_param_uint32_ro(&wd->dev, "timeout_max",
                        &wd->timeout_max, "%u");
@@ -143,7 +143,7 @@ int watchdog_register(struct watchdog *wd)
                return PTR_ERR(p);
 
        p = dev_add_param_uint32(&wd->dev, "timeout_cur", watchdog_set_cur, 
NULL,
-                       &wd->timeout_cur, "%u", wd);
+                       &wd->poller_timeout_cur, "%u", wd);
        if (IS_ERR(p))
                return PTR_ERR(p);
 
diff --git a/include/watchdog.h b/include/watchdog.h
index 0db4263a31ce..68c6b00233d9 100644
--- a/include/watchdog.h
+++ b/include/watchdog.h
@@ -22,7 +22,7 @@ struct watchdog {
        struct device_d dev;
        unsigned int priority;
        unsigned int timeout_max;
-       unsigned int timeout_cur;
+       unsigned int poller_timeout_cur;
        unsigned int poller_enable;
        struct poller_async poller;
        struct list_head list;
-- 
2.23.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox