lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB (5847): Clean up schedule_timeout calls in cpia2 and ivtv code

Browse Source 
Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Robert P. J. Day
2007-07-16 10:47:51 -03:00
committed by Mauro Carvalho Chehab
parent f3a43d3082
commit 97989ada76
2 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/media/video/cpia2/cpia2_core.c
View File

@@ -663,15 +663,13 @@ int cpia2_reset_camera(struct camera_data *cam)
cpia2_send_command(cam, &cmd); cpia2_send_command(cam, &cmd);
} }
current->state = TASK_INTERRUPTIBLE; schedule_timeout_interruptible(msecs_to_jiffies(100));
schedule_timeout(100 * HZ / 1000); /* wait for 100 msecs */
if (cam->params.pnp_id.device_type == DEVICE_STV_672) if (cam->params.pnp_id.device_type == DEVICE_STV_672)
retval = apply_vp_patch(cam); retval = apply_vp_patch(cam);
/* wait for vp to go to sleep */ /* wait for vp to go to sleep */
current->state = TASK_INTERRUPTIBLE; schedule_timeout_interruptible(msecs_to_jiffies(100));
schedule_timeout(100 * HZ / 1000); /* wait for 100 msecs */
/*** /***
* If this is a 676, apply VP5 fixes before we start streaming * If this is a 676, apply VP5 fixes before we start streaming
@@ -720,8 +718,7 @@ int cpia2_reset_camera(struct camera_data *cam)
set_default_user_mode(cam); set_default_user_mode(cam);
/* Give VP time to wake up */ /* Give VP time to wake up */
current->state = TASK_INTERRUPTIBLE; schedule_timeout_interruptible(msecs_to_jiffies(100));
schedule_timeout(100 * HZ / 1000); /* wait for 100 msecs */
set_all_properties(cam); set_all_properties(cam);

9
drivers/media/video/ivtv/ivtv-gpio.c
View File

@@ -115,8 +115,7 @@ void ivtv_reset_ir_gpio(struct ivtv *itv)
curout = (curout & ~0xF) | 1; curout = (curout & ~0xF) | 1;
write_reg(curout, IVTV_REG_GPIO_OUT); write_reg(curout, IVTV_REG_GPIO_OUT);
/* We could use something else for smaller time */ /* We could use something else for smaller time */
current->state = TASK_INTERRUPTIBLE; schedule_timeout_interruptible(msecs_to_jiffies(1));
schedule_timeout(1);
curout |= 2; curout |= 2;
write_reg(curout, IVTV_REG_GPIO_OUT); write_reg(curout, IVTV_REG_GPIO_OUT);
curdir &= ~0x80; curdir &= ~0x80;
@@ -138,13 +137,11 @@ int ivtv_reset_tuner_gpio(enum v4l2_tuner_type mode, void *priv, int ptr)
curout &= ~(1 << 12); curout &= ~(1 << 12);
write_reg(curout, IVTV_REG_GPIO_OUT); write_reg(curout, IVTV_REG_GPIO_OUT);
current->state = TASK_INTERRUPTIBLE; schedule_timeout_interruptible(msecs_to_jiffies(1));
schedule_timeout(1);
curout |= (1 << 12); curout |= (1 << 12);
write_reg(curout, IVTV_REG_GPIO_OUT); write_reg(curout, IVTV_REG_GPIO_OUT);
current->state = TASK_INTERRUPTIBLE; schedule_timeout_interruptible(msecs_to_jiffies(1));
schedule_timeout(1);
return 0; return 0;
} }