Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

V4L/DVB (5858): Use msecs_to_jiffies instead of HZ on media/video I2C drivers

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

+9 -9
+1 -1
drivers/media/video/bt866.c
··· 257 257 printk(KERN_WARNING "%s: I/O error #%d " 258 258 "(write 0x%02x/0x%02x)\n", 259 259 encoder->i2c->name, err, encoder->addr, subaddr); 260 - schedule_timeout_interruptible(HZ/10); 260 + schedule_timeout_interruptible(msecs_to_jiffies(100)); 261 261 } 262 262 if (err == 3) { 263 263 printk(KERN_WARNING "%s: giving up\n",
+4 -4
drivers/media/video/saa5249.c
··· 86 86 87 87 88 88 89 - #define PAGE_WAIT (300*HZ/1000) /* Time between requesting page and */ 89 + #define PAGE_WAIT msecs_to_jiffies(300) /* Time between requesting page and */ 90 90 /* checking status bits */ 91 - #define PGBUF_EXPIRE (15*HZ) /* Time to wait before retransmitting */ 91 + #define PGBUF_EXPIRE msecs_to_jiffies(15000) /* Time to wait before retransmitting */ 92 92 /* page regardless of infobits */ 93 93 typedef struct { 94 94 u8 pgbuf[VTX_VIRTUALSIZE]; /* Page-buffer */ ··· 115 115 #define CCTWR 34 /* I�C write/read-address of vtx-chip */ 116 116 #define CCTRD 35 117 117 #define NOACK_REPEAT 10 /* Retry access this many times on failure */ 118 - #define CLEAR_DELAY (HZ/20) /* Time required to clear a page */ 119 - #define READY_TIMEOUT (30*HZ/1000) /* Time to wait for ready signal of I�C-bus interface */ 118 + #define CLEAR_DELAY msecs_to_jiffies(50) /* Time required to clear a page */ 119 + #define READY_TIMEOUT msecs_to_jiffies(30) /* Time to wait for ready signal of I2C-bus interface */ 120 120 #define INIT_DELAY 500 /* Time in usec to wait at initialization of CEA interface */ 121 121 #define START_DELAY 10 /* Time in usec to wait before starting write-cycle (CEA) */ 122 122
+2 -2
drivers/media/video/saa7110.c
··· 208 208 saa7110_write_block(client, initseq, sizeof(initseq)); 209 209 saa7110_selmux(client, decoder->input); 210 210 prepare_to_wait(&decoder->wq, &wait, TASK_UNINTERRUPTIBLE); 211 - schedule_timeout(HZ/4); 211 + schedule_timeout(msecs_to_jiffies(250)); 212 212 finish_wait(&decoder->wq, &wait); 213 213 status = saa7110_read(client); 214 214 if (status & 0x40) { ··· 249 249 //saa7110_write(client,0x2E,0x9A); 250 250 251 251 prepare_to_wait(&decoder->wq, &wait, TASK_UNINTERRUPTIBLE); 252 - schedule_timeout(HZ/4); 252 + schedule_timeout(msecs_to_jiffies(250)); 253 253 finish_wait(&decoder->wq, &wait); 254 254 255 255 status = saa7110_read(client);
+2 -2
drivers/media/video/tvaudio.c
··· 290 290 desc->checkmode(chip); 291 291 292 292 /* schedule next check */ 293 - mod_timer(&chip->wt, jiffies+2*HZ); 293 + mod_timer(&chip->wt, jiffies+msecs_to_jiffies(2000)); 294 294 } 295 295 296 296 v4l_dbg(1, debug, &chip->c, "%s: thread exiting\n", chip->c.name); ··· 1770 1770 desc->setmode(chip,VIDEO_SOUND_MONO); 1771 1771 if (chip->prevmode != VIDEO_SOUND_MONO) 1772 1772 chip->prevmode = -1; /* reset previous mode */ 1773 - mod_timer(&chip->wt, jiffies+2*HZ); 1773 + mod_timer(&chip->wt, jiffies+msecs_to_jiffies(2000)); 1774 1774 /* the thread will call checkmode() later */ 1775 1775 } 1776 1776 break;