aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/staging/panel
diff options
context:
space:
mode:
authorNicholas Mc Guire <hofrat@osadl.org>2015-05-29 19:02:32 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-05-31 12:04:36 +0900
commit895875a3d85596e3e2e46aeb382bf14f1419de82 (patch)
treeb27a347d02706fba637a6aaeaba2aae17f689646 /drivers/staging/panel
parentstaging: me_daq: use schedule_timeout_interruptible() (diff)
downloadlinux-dev-895875a3d85596e3e2e46aeb382bf14f1419de82.tar.xz
linux-dev-895875a3d85596e3e2e46aeb382bf14f1419de82.zip
staging: panel: use schedule_timeout_interruptible()
API consolidation with coccinelle found: ./drivers/staging/panel/panel.c:782:2-18: 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 timeout was being passed as (ms * HZ + 999) / 1000 but that simply looks wrong - rather than "manual" converting to jiffies, msecs_to_jiffies which handles all corner-cases correctly, was used. Patch was compile tested with x86_64_defconfig + CONFIG_STAGING=y, CONFIG_PARPORT=m, CONFIG_PANEL=m Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org> Acked-by: Willy Tarreau <w@1wt.eu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/panel')
-rw-r--r--drivers/staging/panel/panel.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/staging/panel/panel.c b/drivers/staging/panel/panel.c
index 0046ee0af8b9..d67049455253 100644
--- a/drivers/staging/panel/panel.c
+++ b/drivers/staging/panel/panel.c
@@ -775,12 +775,10 @@ static void pin_to_bits(int pin, unsigned char *d_val, unsigned char *c_val)
/* sleeps that many milliseconds with a reschedule */
static void long_sleep(int ms)
{
- if (in_interrupt()) {
+ if (in_interrupt())
mdelay(ms);
- } else {
- __set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout((ms * HZ + 999) / 1000);
- }
+ else
+ schedule_timeout_interruptible(msecs_to_jiffies(ms));
}
/* send a serial byte to the LCD panel. The caller is responsible for locking