Commit 05997361 authored by Maximilian Attems's avatar Maximilian Attems Committed by Linus Torvalds

[PATCH] janitor: video/radeon_base: replace MS_TO_HZ() with msecs_to_jiffies()

Replace MS_TO_HZ() with msecs_to_jiffies().
Signed-off-by: default avatarNishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: default avatarMaximilian Attems <janitor@sternwelten.at>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3ea649ba
......@@ -61,6 +61,7 @@
#include <linux/tty.h>
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/time.h>
#include <linux/fb.h>
#include <linux/ioport.h>
#include <linux/init.h>
......@@ -991,7 +992,7 @@ static int radeon_screen_blank (struct radeonfb_info *rinfo, int blank, int mode
else {
rinfo->pending_lvds_gen_cntl = target_val;
mod_timer(&rinfo->lvds_timer,
jiffies + MS_TO_HZ(rinfo->panel_info.pwr_delay));
jiffies + msecs_to_jiffies(rinfo->panel_info.pwr_delay));
}
}
} else {
......@@ -1842,7 +1843,7 @@ static int radeon_set_backlight_enable(int on, int level, void *data)
lvds_gen_cntl |= LVDS_ON;
rinfo->pending_lvds_gen_cntl = lvds_gen_cntl;
mod_timer(&rinfo->lvds_timer,
jiffies + MS_TO_HZ(rinfo->panel_info.pwr_delay));
jiffies + msecs_to_jiffies(rinfo->panel_info.pwr_delay));
} else {
lvds_gen_cntl &= ~LVDS_BL_MOD_LEVEL_MASK;
lvds_gen_cntl |= (conv_table[level] <<
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment