From: Nicholas Mc Guire Date: Fri, 29 May 2015 15:31:16 +0000 (+0200) Subject: staging: unisys: use schedule_timeout_interruptible() X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=084861124d00b046cb4159b0158e1b74626b8257;p=openwrt%2Fstaging%2Fblogic.git staging: unisys: use schedule_timeout_interruptible() API consolidation with coccinelle found: ./drivers/staging/unisys/visorbus/periodic_work.c:196:3-19: consolidation with schedule_timeout_*() recommended This is a 1:1 conversion with respect to schedule_timeout() to the schedule_timeout_interruptible() helper only - so only an API consolidation to improve readability. The hard coded timeout of 10 jiffies is HZ dependent which it should not be, so it is converted with msecs_to_jiffies. Patch was compile tested with x86_64_defconfig + CONFIG_STAGING=y, CONFIG_UNISYSSPAR=y, CONFIG_UNISYS_VISORBUS=m Patch is against 4.1-rc5 (localversion-next is -next-20150529) Signed-off-by: Nicholas Mc Guire Signed-off-by: Benjamin Romer Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/unisys/visorbus/periodic_work.c b/drivers/staging/unisys/visorbus/periodic_work.c index 3562e8b2824b..5e56088cf855 100644 --- a/drivers/staging/unisys/visorbus/periodic_work.c +++ b/drivers/staging/unisys/visorbus/periodic_work.c @@ -192,8 +192,7 @@ bool visor_periodic_work_stop(struct periodic_work *pw) } if (pw->is_scheduled) { write_unlock(&pw->lock); - __set_current_state(TASK_INTERRUPTIBLE); - schedule_timeout(10); + schedule_timeout_interruptible(msecs_to_jiffies(10)); write_lock(&pw->lock); } else { pw->want_to_stop = false;