Commit fe06fe0a authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

V4L/DVB (5861): Use msecs_to_jiffies instead of HZ on bttv, cx88 and saa7134 



Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@infradead.org>
parent 818ca471

drivers/media/video/bt8xx/bttv-cards.c

+1 −1
Original line number Diff line number Diff line
@@ -4209,7 +4209,7 @@ static int tea5757_read(struct bttv *btv) 
	bus_low(btv,btv->mbox_clk);



	udelay(10);

	timeout= jiffies + HZ;

	timeout= jiffies + msecs_to_jiffies(1000);



	/* wait for DATA line to go low; error if it doesn't */

	while (bus_in(btv,btv->mbox_data) && time_before(jiffies, timeout))

drivers/media/video/bt8xx/bttv-input.c

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ static void bttv_ir_start(struct bttv *btv, struct card_ir *ir) 
{

	if (ir->polling) {

		setup_timer(&ir->timer, bttv_input_timer, (unsigned long)btv);

		ir->timer.expires  = jiffies + HZ;

		ir->timer.expires  = jiffies + msecs_to_jiffies(1000);

		add_timer(&ir->timer);

	} else if (ir->rc5_gpio) {

		/* set timer_end for code completion */

drivers/media/video/bt8xx/bttvp.h

+2 −2
Original line number Diff line number Diff line
@@ -284,8 +284,8 @@ extern int fini_bttv_i2c(struct bttv *btv); 
#define d2printk if (bttv_debug >= 2) printk



#define BTTV_MAX_FBUF   0x208000

#define BTTV_TIMEOUT    (HZ/2) /* 0.5 seconds */

#define BTTV_FREE_IDLE  (HZ)   /* one second */

#define BTTV_TIMEOUT    msecs_to_jiffies(500)    /* 0.5 seconds */

#define BTTV_FREE_IDLE  msecs_to_jiffies(1000)   /* one second */





struct bttv_pll_info {

drivers/media/video/cx88/cx88.h

+1 −1
Original line number Diff line number Diff line
@@ -259,7 +259,7 @@ struct cx88_subid { 
#define RESOURCE_VIDEO         2

#define RESOURCE_VBI           4



#define BUFFER_TIMEOUT     (HZ/2)  /* 0.5 seconds */

#define BUFFER_TIMEOUT     msecs_to_jiffies(500)  /* 0.5 seconds */



/* buffer for one video frame */

struct cx88_buffer {

drivers/media/video/saa7134/saa7134.h

+1 −1
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ struct saa7134_board { 
#define INTERLACE_ON           1

#define INTERLACE_OFF          2



#define BUFFER_TIMEOUT     (HZ/2)  /* 0.5 seconds */

#define BUFFER_TIMEOUT     msecs_to_jiffies(500)  /* 0.5 seconds */



struct saa7134_dev;

struct saa7134_dma;