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

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>

2 files changed, 6 insertions, 12 deletions

diff --git a/drivers/media/video/cpia2/cpia2_core.c b/drivers/media/video/cpia2/cpia2_core.c
index fd771c7a2fe2..55aab8d38880 100644
--- a/drivers/media/video/cpia2/cpia2_core.c
+++ b/drivers/media/video/cpia2/cpia2_core.c
@@ -663,15 +663,13 @@ int cpia2_reset_camera(struct camera_data *cam)
                 cpia2_send_command(cam, &cmd);
         }
 
-        current->state = TASK_INTERRUPTIBLE;
-        schedule_timeout(100 * HZ / 1000);      /* wait for 100 msecs */
+        schedule_timeout_interruptible(msecs_to_jiffies(100));
 
         if (cam->params.pnp_id.device_type == DEVICE_STV_672)
                 retval = apply_vp_patch(cam);
 
         /* wait for vp to go to sleep */
-        current->state = TASK_INTERRUPTIBLE;
-        schedule_timeout(100 * HZ / 1000);      /* wait for 100 msecs */
+        schedule_timeout_interruptible(msecs_to_jiffies(100));
 
         /***
          * 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);
 
         /* Give VP time to wake up */
-        current->state = TASK_INTERRUPTIBLE;
-        schedule_timeout(100 * HZ / 1000);      /* wait for 100 msecs */
+        schedule_timeout_interruptible(msecs_to_jiffies(100));
 
         set_all_properties(cam);
 
diff --git a/drivers/media/video/ivtv/ivtv-gpio.c b/drivers/media/video/ivtv/ivtv-gpio.c
index bc8f8ca2961f..676418cbaaad 100644
--- a/drivers/media/video/ivtv/ivtv-gpio.c
+++ b/drivers/media/video/ivtv/ivtv-gpio.c
@@ -115,8 +115,7 @@ void ivtv_reset_ir_gpio(struct ivtv *itv)
         curout = (curout & ~0xF) | 1;
         write_reg(curout, IVTV_REG_GPIO_OUT);
         /* We could use something else for smaller time */
-        current->state = TASK_INTERRUPTIBLE;
-        schedule_timeout(1);
+        schedule_timeout_interruptible(msecs_to_jiffies(1));
         curout |= 2;
         write_reg(curout, IVTV_REG_GPIO_OUT);
         curdir &= ~0x80;
@@ -138,13 +137,11 @@ int ivtv_reset_tuner_gpio(enum v4l2_tuner_type mode, void *priv, int ptr)
 
         curout &= ~(1 << 12);
         write_reg(curout, IVTV_REG_GPIO_OUT);
-        current->state = TASK_INTERRUPTIBLE;
-        schedule_timeout(1);
+        schedule_timeout_interruptible(msecs_to_jiffies(1));
 
         curout |= (1 << 12);
         write_reg(curout, IVTV_REG_GPIO_OUT);
-        current->state = TASK_INTERRUPTIBLE;
-        schedule_timeout(1);
+        schedule_timeout_interruptible(msecs_to_jiffies(1));
 
         return 0;
 }