Re: [PATCH v5 5/8] watchdog: Simplify update_worker

2015-11-23 Thread Guenter Roeck 

Hi Uwe,

On 11/23/2015 11:13 PM, Uwe Kleine-König wrote:

Hello,

On Sun, Nov 22, 2015 at 07:21:02PM -0800, Guenter Roeck wrote:

Drop 'cancel' parameter; simply cancel worker unconditionally
if not needed.

Signed-off-by: Guenter Roeck 


This is a good change, but given that watchdog_update_worker is
introduced in this series it should be squashed accordingly.



As I tried to explain, I didn't squash it because, even though
I could not find any trouble with it, I am still not sure if
it may cause trouble or not. As such, I found it better to keep
it separate to make it easier to revert it _if_, as unlikely as
it may be, it should be needed.

Ultimately I'd like to get some input from Wim on this.

Thanks,
Guenter

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Re: [PATCH v5 5/8] watchdog: Simplify update_worker

2015-11-23 Thread Uwe Kleine-König 
Hello,

On Sun, Nov 22, 2015 at 07:21:02PM -0800, Guenter Roeck wrote:
> Drop 'cancel' parameter; simply cancel worker unconditionally
> if not needed.
> 
> Signed-off-by: Guenter Roeck 

This is a good change, but given that watchdog_update_worker is
introduced in this series it should be squashed accordingly.

Best regards
Uwe

-- 
Pengutronix e.K.   | Uwe Kleine-König|
Industrial Linux Solutions | http://www.pengutronix.de/  |
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[PATCH v5 5/8] watchdog: Simplify update_worker

2015-11-22 Thread Guenter Roeck 
Drop 'cancel' parameter; simply cancel worker unconditionally
if not needed.

Signed-off-by: Guenter Roeck 
---
v5: Added patch.

 drivers/watchdog/watchdog_dev.c | 15 +++
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c
index 832bd5ac15b5..722ea86fcc7c 100644
--- a/drivers/watchdog/watchdog_dev.c
+++ b/drivers/watchdog/watchdog_dev.c
@@ -96,15 +96,14 @@ static long watchdog_next_keepalive(struct watchdog_device 
*wdd)
return min_t(long, last_heartbeat - jiffies, keepalive_interval);
 }
 
-static inline void watchdog_update_worker(struct watchdog_device *wdd,
- bool cancel)
+static inline void watchdog_update_worker(struct watchdog_device *wdd)
 {
if (watchdog_need_worker(wdd)) {
long t = watchdog_next_keepalive(wdd);
 
if (t > 0)
mod_delayed_work(watchdog_wq, &wdd->work, t);
-   } else if (cancel) {
+   } else {
cancel_delayed_work(&wdd->work);
}
 }
@@ -133,7 +132,7 @@ static int _watchdog_ping(struct watchdog_device *wdd)
else
err = wdd->ops->start(wdd); /* restart watchdog */
 
-   watchdog_update_worker(wdd, false);
+   watchdog_update_worker(wdd);
 
return err;
 }
@@ -198,7 +197,7 @@ static int watchdog_start(struct watchdog_device *wdd)
if (err == 0) {
set_bit(WDOG_ACTIVE, &wdd->status);
wdd->last_keepalive = jiffies;
-   watchdog_update_worker(wdd, true);
+   watchdog_update_worker(wdd);
}
 
 out_start:
@@ -243,7 +242,7 @@ static int watchdog_stop(struct watchdog_device *wdd)
 
if (err == 0) {
clear_bit(WDOG_ACTIVE, &wdd->status);
-   watchdog_update_worker(wdd, true);
+   watchdog_update_worker(wdd);
}
 
 out_stop:
@@ -311,7 +310,7 @@ static int watchdog_set_timeout(struct watchdog_device *wdd,
else
wdd->timeout = timeout;
 
-   watchdog_update_worker(wdd, true);
+   watchdog_update_worker(wdd);
 
 out_timeout:
mutex_unlock(&wdd->lock);
@@ -590,7 +589,7 @@ static int watchdog_release(struct inode *inode, struct 
file *file)
}
 
cancel_delayed_work_sync(&wdd->work);
-   watchdog_update_worker(wdd, false);
+   watchdog_update_worker(wdd);
 
/*
 * Allow the owner module to be unloaded again unless the watchdog
-- 
2.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/