Merge branch 'net-const'

[linux-2.6-omap-h63xx.git] / drivers / net / appletalk / ltpc.c

diff --git a/drivers/net/appletalk/ltpc.c b/drivers/net/appletalk/ltpc.c
index ad8e943231a1c3a93cb769fb3d1fad23baa40ac6..d5666c37cb0deb39768ff685c2234284716f8f6b 100644 (file)
--- a/drivers/net/appletalk/ltpc.c
+++ b/drivers/net/appletalk/ltpc.c
@@ -1039,7 +1039,7 @@ struct net_device * __init ltpc_probe(void)
        unsigned long f;
        unsigned long timeout;
 
-       dev = alloc_netdev(sizeof(struct ltpc_private), "lt%d", ltalk_setup);
+       dev = alloc_ltalkdev(sizeof(struct ltpc_private));
        if (!dev)
                goto out;
 
@@ -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 */