aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video
diff options
context:
space:
mode:
authorNicholas Mc Guire <hofrat@osadl.org>2015-02-20 09:34:01 -0500
committerTomi Valkeinen <tomi.valkeinen@ti.com>2015-03-10 08:32:13 -0400
commit17713ce09d95fa79a1bf8f8604ecea9c6e1924aa (patch)
tree522357fbfb4b4556017bdf581bd2b0e83145c9e5 /drivers/video
parentdc4d52149bd1f2f3ae48804731c63de523e42787 (diff)
video: fbdev: use msecs_to_jiffies for time conversions
This is only an API consolidation and should make things more readable by replacing var * HZ / 1000 by msecs_to_jiffies(var). Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/video')
-rw-r--r--drivers/video/fbdev/pxafb.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/fbdev/pxafb.c b/drivers/video/fbdev/pxafb.c
index da2431eda2fd..7245611ec963 100644
--- a/drivers/video/fbdev/pxafb.c
+++ b/drivers/video/fbdev/pxafb.c
@@ -1285,7 +1285,7 @@ static int pxafb_smart_thread(void *arg)
1285 mutex_unlock(&fbi->ctrlr_lock); 1285 mutex_unlock(&fbi->ctrlr_lock);
1286 1286
1287 set_current_state(TASK_INTERRUPTIBLE); 1287 set_current_state(TASK_INTERRUPTIBLE);
1288 schedule_timeout(30 * HZ / 1000); 1288 schedule_timeout(msecs_to_jiffies(30));
1289 } 1289 }
1290 1290
1291 pr_debug("%s(): task ending\n", __func__); 1291 pr_debug("%s(): task ending\n", __func__);
@@ -1460,7 +1460,7 @@ static void pxafb_disable_controller(struct pxafb_info *fbi)
1460#ifdef CONFIG_FB_PXA_SMARTPANEL 1460#ifdef CONFIG_FB_PXA_SMARTPANEL
1461 if (fbi->lccr0 & LCCR0_LCDT) { 1461 if (fbi->lccr0 & LCCR0_LCDT) {
1462 wait_for_completion_timeout(&fbi->refresh_done, 1462 wait_for_completion_timeout(&fbi->refresh_done,
1463 200 * HZ / 1000); 1463 msecs_to_jiffies(200));
1464 return; 1464 return;
1465 } 1465 }
1466#endif 1466#endif
@@ -1472,7 +1472,7 @@ static void pxafb_disable_controller(struct pxafb_info *fbi)
1472 lcd_writel(fbi, LCCR0, lccr0); 1472 lcd_writel(fbi, LCCR0, lccr0);
1473 lcd_writel(fbi, LCCR0, lccr0 | LCCR0_DIS); 1473 lcd_writel(fbi, LCCR0, lccr0 | LCCR0_DIS);
1474 1474
1475 wait_for_completion_timeout(&fbi->disable_done, 200 * HZ / 1000); 1475 wait_for_completion_timeout(&fbi->disable_done, msecs_to_jiffies(200));
1476 1476
1477 /* disable LCD controller clock */ 1477 /* disable LCD controller clock */
1478 clk_disable_unprepare(fbi->clk); 1478 clk_disable_unprepare(fbi->clk);