]> err.no Git - linux-2.6/commitdiff
[LTPC]: Replace schedule_timeout() with ssleep()/msleep()
authorNishanth Aravamudan <nacc@us.ibm.com>
Thu, 23 Jun 2005 05:19:52 +0000 (22:19 -0700)
committerDavid S. Miller <davem@davemloft.net>
Thu, 23 Jun 2005 05:19:52 +0000 (22:19 -0700)
Use ssleep() / msleep() [as appropriate]
instead of schedule_timeout() to guarantee the task delays as expected.

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Acked-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/appletalk/ltpc.c

index db4f369637b63f435bf04694e5641e9cf535281f..d5666c37cb0deb39768ff685c2234284716f8f6b 100644 (file)
@@ -1109,8 +1109,7 @@ struct net_device * __init ltpc_probe(void)
        inb_p(io+1);
        inb_p(io+3);
 
-       set_current_state(TASK_UNINTERRUPTIBLE);
-       schedule_timeout(2*HZ/100);
+       msleep(20);
 
        inb_p(io+0);
        inb_p(io+2);
@@ -1120,8 +1119,7 @@ struct net_device * __init ltpc_probe(void)
        inb_p(io+5); /* enable dma */
        inb_p(io+6); /* tri-state interrupt line */
 
-       set_current_state(TASK_UNINTERRUPTIBLE);
-       schedule_timeout(HZ);
+       ssleep(1);
        
        /* now, figure out which dma channel we're using, unless it's
           already been specified */