diff options
| author | Jeff Garzik <jeff@garzik.org> | 2008-05-06 18:16:24 +0200 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2008-05-06 18:16:24 +0200 |
| commit | 7ab267d4ecdad3032d6bb31619a2744fc2074b59 (patch) | |
| tree | e6425d80e0ab9681cb9b6573924be1bbaf961ed9 /drivers/net/appletalk/cops.c | |
| parent | e1000e: Add support for BM PHYs on ICH9 (diff) | |
| download | linux-7ab267d4ecdad3032d6bb31619a2744fc2074b59.tar.xz linux-7ab267d4ecdad3032d6bb31619a2744fc2074b59.zip | |
fix warning in drivers/net/appletalk/cops.c
drivers/net/appletalk/cops.c: In function ‘cops_reset’:
drivers/net/appletalk/cops.c:507: warning: comparison of distinct pointer
types lacks a cast
by replacing hand-woven msleep() with call to msleep()
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net/appletalk/cops.c')
| -rw-r--r-- | drivers/net/appletalk/cops.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/drivers/net/appletalk/cops.c b/drivers/net/appletalk/cops.c index 82e9a5bd0dd2..a0b4c8516073 100644 --- a/drivers/net/appletalk/cops.c +++ b/drivers/net/appletalk/cops.c @@ -499,19 +499,13 @@ static void cops_reset(struct net_device *dev, int sleep) { outb(0, ioaddr+DAYNA_RESET); /* Assert the reset port */ inb(ioaddr+DAYNA_RESET); /* Clear the reset */ - if(sleep) - { - long snap=jiffies; - - /* Let card finish initializing, about 1/3 second */ - while (time_before(jiffies, snap + HZ/3)) - schedule(); - } - else - mdelay(333); + if (sleep) + msleep(333); + else + mdelay(333); } + netif_wake_queue(dev); - return; } static void cops_load (struct net_device *dev) |