V4L/DVB (5847): Clean up schedule_timeout calls in cpia2 and ivtv code
authorRobert P. J. Day <rpjday@mindspring.com>
Mon, 16 Jul 2007 13:47:51 +0000 (10:47 -0300)
committerMauro Carvalho Chehab <mchehab@infradead.org>
Wed, 18 Jul 2007 17:24:49 +0000 (14:24 -0300)
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>
drivers/media/video/cpia2/cpia2_core.c
drivers/media/video/ivtv/ivtv-gpio.c

index fd771c7a2fe24fa930768c612eee546c13f68072..55aab8d38880296336a0de8497fb19043fbac98a 100644 (file)
@@ -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);
 
index bc8f8ca2961f4564c771260bde1d39184b544b30..676418cbaaad14b909fd44c22441766d4f90b52a 100644 (file)
@@ -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;
 }