| Message ID | 20160909051926.4253-2-joshua.scott@alliedtelesis.co.nz (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On 09/08/2016 10:19 PM, Joshua Scott wrote: > adt7470_remove will wait for the update thread to complete before > returning. This had a worst-case time of up to the user-configurable > auto_update_interval. > > Replace msleep_interruptible with set_current_state and schedule_timeout > so that kthread_stop will interrupt the sleep. > > Signed-off-by: Joshua Scott <joshua.scott@alliedtelesis.co.nz> Applied to -next. Thanks, Guenter > --- > drivers/hwmon/adt7470.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/hwmon/adt7470.c b/drivers/hwmon/adt7470.c > index dbd758b..ffe1edc 100644 > --- a/drivers/hwmon/adt7470.c > +++ b/drivers/hwmon/adt7470.c > @@ -273,9 +273,12 @@ static int adt7470_update_thread(void *p) > mutex_lock(&data->lock); > adt7470_read_temperatures(client, data); > mutex_unlock(&data->lock); > + > + set_current_state(TASK_INTERRUPTIBLE); > if (kthread_should_stop()) > break; > - msleep_interruptible(data->auto_update_interval); > + > + schedule_timeout(msecs_to_jiffies(data->auto_update_interval)); > } > > complete_all(&data->auto_update_stop); > -- To unsubscribe from this list: send the line "unsubscribe linux-hwmon" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/hwmon/adt7470.c b/drivers/hwmon/adt7470.c index dbd758b..ffe1edc 100644 --- a/drivers/hwmon/adt7470.c +++ b/drivers/hwmon/adt7470.c @@ -273,9 +273,12 @@ static int adt7470_update_thread(void *p) mutex_lock(&data->lock); adt7470_read_temperatures(client, data); mutex_unlock(&data->lock); + + set_current_state(TASK_INTERRUPTIBLE); if (kthread_should_stop()) break; - msleep_interruptible(data->auto_update_interval); + + schedule_timeout(msecs_to_jiffies(data->auto_update_interval)); } complete_all(&data->auto_update_stop);
adt7470_remove will wait for the update thread to complete before returning. This had a worst-case time of up to the user-configurable auto_update_interval. Replace msleep_interruptible with set_current_state and schedule_timeout so that kthread_stop will interrupt the sleep. Signed-off-by: Joshua Scott <joshua.scott@alliedtelesis.co.nz> --- drivers/hwmon/adt7470.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)