patch-2_6_7-vs1_9_1_12

[linux-2.6.git] / drivers / net / irda / girbil.c

diff --git a/drivers/net/irda/girbil.c b/drivers/net/irda/girbil.c
index 575600e..ecac87d 100644 (file)
--- a/drivers/net/irda/girbil.c
+++ b/drivers/net/irda/girbil.c
@@ -119,7 +119,7 @@ static int girbil_change_speed(struct irda_task *task)
                        irda_task_next_state(task, IRDA_TASK_CHILD_WAIT);
 
                        /* Give reset 1 sec to finish */
-                       ret = MSECS_TO_JIFFIES(1000);
+                       ret = msecs_to_jiffies(1000);
                }
                break;
        case IRDA_TASK_CHILD_WAIT:
@@ -153,7 +153,7 @@ static int girbil_change_speed(struct irda_task *task)
                /* Write control bytes */
                self->write(self->dev, control, 2);
                irda_task_next_state(task, IRDA_TASK_WAIT);
-               ret = MSECS_TO_JIFFIES(100);
+               ret = msecs_to_jiffies(100);
                break;
        case IRDA_TASK_WAIT:
                /* Go back to normal mode */
@@ -194,19 +194,19 @@ static int girbil_reset(struct irda_task *task)
                self->set_dtr_rts(self->dev, TRUE, FALSE);
                irda_task_next_state(task, IRDA_TASK_WAIT1);
                /* Sleep at least 5 ms */
-               ret = MSECS_TO_JIFFIES(20);
+               ret = msecs_to_jiffies(20);
                break;
        case IRDA_TASK_WAIT1:
                /* Set DTR and clear RTS to enter command mode */
                self->set_dtr_rts(self->dev, FALSE, TRUE);
                irda_task_next_state(task, IRDA_TASK_WAIT2);
-               ret = MSECS_TO_JIFFIES(20);
+               ret = msecs_to_jiffies(20);
                break;
        case IRDA_TASK_WAIT2:
                /* Write control byte */
                self->write(self->dev, &control, 1);
                irda_task_next_state(task, IRDA_TASK_WAIT3);
-               ret = MSECS_TO_JIFFIES(20);
+               ret = msecs_to_jiffies(20);
                break;
        case IRDA_TASK_WAIT3:
                /* Go back to normal mode */