vserver 2.0 rc7

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

diff --git a/drivers/net/irda/ma600-sir.c b/drivers/net/irda/ma600-sir.c
index 9c0a5d6..ebed168 100644 (file)
--- a/drivers/net/irda/ma600-sir.c
+++ b/drivers/net/irda/ma600-sir.c
@@ -191,8 +191,7 @@ static int ma600_change_speed(struct sir_dev *dev, unsigned speed)
        sirdev_raw_write(dev, &byte, sizeof(byte));
 
        /* Wait at least 10ms: fake wait_until_sent - 10 bits at 9600 baud*/
-       set_current_state(TASK_UNINTERRUPTIBLE);
-       schedule_timeout(msecs_to_jiffies(15));         /* old ma600 uses 15ms */
+       msleep(15);                                     /* old ma600 uses 15ms */
 
 #if 1
        /* read-back of the control byte. ma600 is the first dongle driver
@@ -202,9 +201,9 @@ static int ma600_change_speed(struct sir_dev *dev, unsigned speed)
 
        sirdev_raw_read(dev, &byte, sizeof(byte));
        if (byte != get_control_byte(speed))  {
-               WARNING("%s(): bad control byte read-back %02x != %02x\n",
-                       __FUNCTION__, (unsigned) byte,
-                       (unsigned) get_control_byte(speed));
+               IRDA_WARNING("%s(): bad control byte read-back %02x != %02x\n",
+                            __FUNCTION__, (unsigned) byte,
+                            (unsigned) get_control_byte(speed));
                return -1;
        }
        else
@@ -215,8 +214,7 @@ static int ma600_change_speed(struct sir_dev *dev, unsigned speed)
        sirdev_set_dtr_rts(dev, TRUE, TRUE);
 
        /* Wait at least 10ms */
-       set_current_state(TASK_UNINTERRUPTIBLE);
-       schedule_timeout(msecs_to_jiffies(10));
+       msleep(10);
 
        /* dongle is now switched to the new speed */
        dev->speed = speed;
@@ -245,13 +243,11 @@ int ma600_reset(struct sir_dev *dev)
 
        /* Reset the dongle : set DTR low for 10 ms */
        sirdev_set_dtr_rts(dev, FALSE, TRUE);
-       set_current_state(TASK_UNINTERRUPTIBLE);
-       schedule_timeout(msecs_to_jiffies(10));
+       msleep(10);
 
        /* Go back to normal mode */
        sirdev_set_dtr_rts(dev, TRUE, TRUE);
-       set_current_state(TASK_UNINTERRUPTIBLE);
-       schedule_timeout(msecs_to_jiffies(10));
+       msleep(10);
 
        dev->speed = 9600;      /* That's the dongle-default */