Commit 09df5cbe authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

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



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

drivers/media/video/bt866.c

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ static int bt866_write(struct bt866 *encoder, 
		printk(KERN_WARNING "%s: I/O error #%d "

		       "(write 0x%02x/0x%02x)\n",

		       encoder->i2c->name, err, encoder->addr, subaddr);

		schedule_timeout_interruptible(HZ/10);

		schedule_timeout_interruptible(msecs_to_jiffies(100));

	}

	if (err == 3) {

		printk(KERN_WARNING "%s: giving up\n",

drivers/media/video/saa5249.c

+4 −4
Original line number Diff line number Diff line
@@ -86,9 +86,9 @@ static const int disp_modes[8][3] = 






#define PAGE_WAIT (300*HZ/1000)			/* Time between requesting page and */

#define PAGE_WAIT    msecs_to_jiffies(300)	/* Time between requesting page and */

						/* checking status bits */

#define PGBUF_EXPIRE (15*HZ)			/* Time to wait before retransmitting */

#define PGBUF_EXPIRE msecs_to_jiffies(15000)	/* Time to wait before retransmitting */

						/* page regardless of infobits */

typedef struct {

	u8 pgbuf[VTX_VIRTUALSIZE];		/* Page-buffer */
@@ -115,8 +115,8 @@ struct saa5249_device 
#define CCTWR 34		/* IC write/read-address of vtx-chip */

#define CCTRD 35

#define NOACK_REPEAT 10		/* Retry access this many times on failure */

#define CLEAR_DELAY (HZ/20)	/* Time required to clear a page */

#define READY_TIMEOUT (30*HZ/1000)	/* Time to wait for ready signal of IC-bus interface */

#define CLEAR_DELAY   msecs_to_jiffies(50)	/* Time required to clear a page */

#define READY_TIMEOUT msecs_to_jiffies(30)	/* Time to wait for ready signal of I2C-bus interface */

#define INIT_DELAY 500		/* Time in usec to wait at initialization of CEA interface */

#define START_DELAY 10		/* Time in usec to wait before starting write-cycle (CEA) */

drivers/media/video/saa7110.c

+2 −2
Original line number Diff line number Diff line
@@ -208,7 +208,7 @@ determine_norm (struct i2c_client *client) 
	saa7110_write_block(client, initseq, sizeof(initseq));

	saa7110_selmux(client, decoder->input);

	prepare_to_wait(&decoder->wq, &wait, TASK_UNINTERRUPTIBLE);

	schedule_timeout(HZ/4);

	schedule_timeout(msecs_to_jiffies(250));

	finish_wait(&decoder->wq, &wait);

	status = saa7110_read(client);

	if (status & 0x40) {
@@ -249,7 +249,7 @@ determine_norm (struct i2c_client *client) 
	//saa7110_write(client,0x2E,0x9A);



	prepare_to_wait(&decoder->wq, &wait, TASK_UNINTERRUPTIBLE);

	schedule_timeout(HZ/4);

	schedule_timeout(msecs_to_jiffies(250));

	finish_wait(&decoder->wq, &wait);



	status = saa7110_read(client);

drivers/media/video/tvaudio.c

+2 −2
Original line number Diff line number Diff line
@@ -290,7 +290,7 @@ static int chip_thread(void *data) 
		desc->checkmode(chip);



		/* schedule next check */

		mod_timer(&chip->wt, jiffies+2*HZ);

		mod_timer(&chip->wt, jiffies+msecs_to_jiffies(2000));

	}



	v4l_dbg(1, debug, &chip->c, "%s: thread exiting\n", chip->c.name);
@@ -1770,7 +1770,7 @@ static int chip_command(struct i2c_client *client, 
			desc->setmode(chip,VIDEO_SOUND_MONO);

			if (chip->prevmode != VIDEO_SOUND_MONO)

				chip->prevmode = -1; /* reset previous mode */

			mod_timer(&chip->wt, jiffies+2*HZ);

			mod_timer(&chip->wt, jiffies+msecs_to_jiffies(2000));

			/* the thread will call checkmode() later */

		}

		break;