diff options
author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-17 15:15:58 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-07-20 16:35:47 -0400 |
commit | a2d66a37c743ba201e85c93c4ec29d58ca94b728 (patch) | |
tree | d33348f5f4c5619cabf951b89d2bbae7026bed8e | |
parent | 7809b4cba2bc0165c804ab4eaf10308aad14fc8e (diff) |
V4L/DVB (5857): Use msecs_to_jiffies instead of HZ on radio drivers
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r-- | drivers/media/radio/radio-aimslab.c | 2 | ||||
-rw-r--r-- | drivers/media/radio/radio-cadet.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/media/radio/radio-aimslab.c b/drivers/media/radio/radio-aimslab.c index ce940b1b787f..f0a67e93d7fd 100644 --- a/drivers/media/radio/radio-aimslab.c +++ b/drivers/media/radio/radio-aimslab.c | |||
@@ -63,7 +63,7 @@ struct rt_device | |||
63 | static void sleep_delay(long n) | 63 | static void sleep_delay(long n) |
64 | { | 64 | { |
65 | /* Sleep nicely for 'n' uS */ | 65 | /* Sleep nicely for 'n' uS */ |
66 | int d=n/(1000000/HZ); | 66 | int d=n/msecs_to_jiffies(1000); |
67 | if(!d) | 67 | if(!d) |
68 | udelay(n); | 68 | udelay(n); |
69 | else | 69 | else |
diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c index 8cf2e9df5c8a..34e317ced5a3 100644 --- a/drivers/media/radio/radio-cadet.c +++ b/drivers/media/radio/radio-cadet.c | |||
@@ -329,7 +329,7 @@ cadet_handler(unsigned long data) | |||
329 | init_timer(&readtimer); | 329 | init_timer(&readtimer); |
330 | readtimer.function=cadet_handler; | 330 | readtimer.function=cadet_handler; |
331 | readtimer.data=(unsigned long)0; | 331 | readtimer.data=(unsigned long)0; |
332 | readtimer.expires=jiffies+(HZ/20); | 332 | readtimer.expires=jiffies+msecs_to_jiffies(50); |
333 | add_timer(&readtimer); | 333 | add_timer(&readtimer); |
334 | } | 334 | } |
335 | 335 | ||
@@ -349,7 +349,7 @@ cadet_read(struct file *file, char __user *data, size_t count, loff_t *ppos) | |||
349 | init_timer(&readtimer); | 349 | init_timer(&readtimer); |
350 | readtimer.function=cadet_handler; | 350 | readtimer.function=cadet_handler; |
351 | readtimer.data=(unsigned long)0; | 351 | readtimer.data=(unsigned long)0; |
352 | readtimer.expires=jiffies+(HZ/20); | 352 | readtimer.expires=jiffies+msecs_to_jiffies(50); |
353 | add_timer(&readtimer); | 353 | add_timer(&readtimer); |
354 | } | 354 | } |
355 | if(rdsin==rdsout) { | 355 | if(rdsin==rdsout) { |