aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pcmcia/3c589_cs.c
diff options
context:
space:
mode:
authorDominik Brodowski <linux@dominikbrodowski.net>2006-03-05 05:04:33 -0500
committerDominik Brodowski <linux@dominikbrodowski.net>2006-03-31 10:26:57 -0500
commit9940ec3617fec1db13e589bbc3f37e37878c7683 (patch)
treeed0547040dc815fe1e2039fc1cba1613d5308cc7 /drivers/net/pcmcia/3c589_cs.c
parente2d4096365e06b9a3799afbadc28b4519c0b3526 (diff)
[PATCH] pcmcia: convert DEV_OK to pcmcia_dev_present
Instead of the DEV_OK macro, drivers should use pcmcia_dev_present(). Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/net/pcmcia/3c589_cs.c')
-rw-r--r--drivers/net/pcmcia/3c589_cs.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c
index 3d05f66e9c70..875a0fe251e7 100644
--- a/drivers/net/pcmcia/3c589_cs.c
+++ b/drivers/net/pcmcia/3c589_cs.c
@@ -557,7 +557,7 @@ static int el3_open(struct net_device *dev)
557 struct el3_private *lp = netdev_priv(dev); 557 struct el3_private *lp = netdev_priv(dev);
558 struct pcmcia_device *link = lp->p_dev; 558 struct pcmcia_device *link = lp->p_dev;
559 559
560 if (!DEV_OK(link)) 560 if (!pcmcia_dev_present(link))
561 return -ENODEV; 561 return -ENODEV;
562 562
563 link->open++; 563 link->open++;
@@ -818,7 +818,7 @@ static struct net_device_stats *el3_get_stats(struct net_device *dev)
818 unsigned long flags; 818 unsigned long flags;
819 struct pcmcia_device *link = lp->p_dev; 819 struct pcmcia_device *link = lp->p_dev;
820 820
821 if (DEV_OK(link)) { 821 if (pcmcia_dev_present(link)) {
822 spin_lock_irqsave(&lp->lock, flags); 822 spin_lock_irqsave(&lp->lock, flags);
823 update_stats(dev); 823 update_stats(dev);
824 spin_unlock_irqrestore(&lp->lock, flags); 824 spin_unlock_irqrestore(&lp->lock, flags);
@@ -922,7 +922,7 @@ static void set_multicast_list(struct net_device *dev)
922 kio_addr_t ioaddr = dev->base_addr; 922 kio_addr_t ioaddr = dev->base_addr;
923 u16 opts = SetRxFilter | RxStation | RxBroadcast; 923 u16 opts = SetRxFilter | RxStation | RxBroadcast;
924 924
925 if (!(DEV_OK(link))) return; 925 if (!pcmcia_dev_present(link)) return;
926 if (dev->flags & IFF_PROMISC) 926 if (dev->flags & IFF_PROMISC)
927 opts |= RxMulticast | RxProm; 927 opts |= RxMulticast | RxProm;
928 else if (dev->mc_count || (dev->flags & IFF_ALLMULTI)) 928 else if (dev->mc_count || (dev->flags & IFF_ALLMULTI))
@@ -938,7 +938,7 @@ static int el3_close(struct net_device *dev)
938 938
939 DEBUG(1, "%s: shutting down ethercard.\n", dev->name); 939 DEBUG(1, "%s: shutting down ethercard.\n", dev->name);
940 940
941 if (DEV_OK(link)) { 941 if (pcmcia_dev_present(link)) {
942 /* Turn off statistics ASAP. We update lp->stats below. */ 942 /* Turn off statistics ASAP. We update lp->stats below. */
943 outw(StatsDisable, ioaddr + EL3_CMD); 943 outw(StatsDisable, ioaddr + EL3_CMD);
944 944