aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pcmcia
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
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')
-rw-r--r--drivers/net/pcmcia/3c574_cs.c4
-rw-r--r--drivers/net/pcmcia/3c589_cs.c8
-rw-r--r--drivers/net/pcmcia/axnet_cs.c2
-rw-r--r--drivers/net/pcmcia/fmvj18x_cs.c2
-rw-r--r--drivers/net/pcmcia/nmclan_cs.c2
-rw-r--r--drivers/net/pcmcia/pcnet_cs.c2
-rw-r--r--drivers/net/pcmcia/smc91c92_cs.c2
-rw-r--r--drivers/net/pcmcia/xirc2ps_cs.c2
8 files changed, 12 insertions, 12 deletions
diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c
index 70e3cca09787..fab93360f017 100644
--- a/drivers/net/pcmcia/3c574_cs.c
+++ b/drivers/net/pcmcia/3c574_cs.c
@@ -728,7 +728,7 @@ static int el3_open(struct net_device *dev)
728 struct el3_private *lp = netdev_priv(dev); 728 struct el3_private *lp = netdev_priv(dev);
729 struct pcmcia_device *link = lp->p_dev; 729 struct pcmcia_device *link = lp->p_dev;
730 730
731 if (!DEV_OK(link)) 731 if (!pcmcia_dev_present(link))
732 return -ENODEV; 732 return -ENODEV;
733 733
734 link->open++; 734 link->open++;
@@ -1176,7 +1176,7 @@ static int el3_close(struct net_device *dev)
1176 1176
1177 DEBUG(2, "%s: shutting down ethercard.\n", dev->name); 1177 DEBUG(2, "%s: shutting down ethercard.\n", dev->name);
1178 1178
1179 if (DEV_OK(link)) { 1179 if (pcmcia_dev_present(link)) {
1180 unsigned long flags; 1180 unsigned long flags;
1181 1181
1182 /* Turn off statistics ASAP. We update lp->stats below. */ 1182 /* Turn off statistics ASAP. We update lp->stats below. */
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
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index 0f1219c11853..56233afcb2b3 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -530,7 +530,7 @@ static int axnet_open(struct net_device *dev)
530 530
531 DEBUG(2, "axnet_open('%s')\n", dev->name); 531 DEBUG(2, "axnet_open('%s')\n", dev->name);
532 532
533 if (!DEV_OK(link)) 533 if (!pcmcia_dev_present(link))
534 return -ENODEV; 534 return -ENODEV;
535 535
536 link->open++; 536 link->open++;
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c
index 7cb20b6b9348..09b11761cdfa 100644
--- a/drivers/net/pcmcia/fmvj18x_cs.c
+++ b/drivers/net/pcmcia/fmvj18x_cs.c
@@ -1112,7 +1112,7 @@ static int fjn_open(struct net_device *dev)
1112 1112
1113 DEBUG(4, "fjn_open('%s').\n", dev->name); 1113 DEBUG(4, "fjn_open('%s').\n", dev->name);
1114 1114
1115 if (!DEV_OK(link)) 1115 if (!pcmcia_dev_present(link))
1116 return -ENODEV; 1116 return -ENODEV;
1117 1117
1118 link->open++; 1118 link->open++;
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c
index fd191143cb2f..4260c2128f47 100644
--- a/drivers/net/pcmcia/nmclan_cs.c
+++ b/drivers/net/pcmcia/nmclan_cs.c
@@ -853,7 +853,7 @@ static int mace_open(struct net_device *dev)
853 mace_private *lp = netdev_priv(dev); 853 mace_private *lp = netdev_priv(dev);
854 struct pcmcia_device *link = lp->p_dev; 854 struct pcmcia_device *link = lp->p_dev;
855 855
856 if (!DEV_OK(link)) 856 if (!pcmcia_dev_present(link))
857 return -ENODEV; 857 return -ENODEV;
858 858
859 link->open++; 859 link->open++;
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index d9661410f2ff..506e777c5f06 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -992,7 +992,7 @@ static int pcnet_open(struct net_device *dev)
992 992
993 DEBUG(2, "pcnet_open('%s')\n", dev->name); 993 DEBUG(2, "pcnet_open('%s')\n", dev->name);
994 994
995 if (!DEV_OK(link)) 995 if (!pcmcia_dev_present(link))
996 return -ENODEV; 996 return -ENODEV;
997 997
998 link->open++; 998 link->open++;
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index 7d565f26a3bf..e74bf5014ef6 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -1259,7 +1259,7 @@ static int smc_open(struct net_device *dev)
1259#endif 1259#endif
1260 1260
1261 /* Check that the PCMCIA card is still here. */ 1261 /* Check that the PCMCIA card is still here. */
1262 if (!DEV_OK(link)) 1262 if (!pcmcia_dev_present(link))
1263 return -ENODEV; 1263 return -ENODEV;
1264 /* Physical device present signature. */ 1264 /* Physical device present signature. */
1265 if (check_sig(link) < 0) { 1265 if (check_sig(link) < 0) {
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c
index 0141c5037f41..a92a3134c833 100644
--- a/drivers/net/pcmcia/xirc2ps_cs.c
+++ b/drivers/net/pcmcia/xirc2ps_cs.c
@@ -1525,7 +1525,7 @@ do_open(struct net_device *dev)
1525 1525
1526 /* Check that the PCMCIA card is still here. */ 1526 /* Check that the PCMCIA card is still here. */
1527 /* Physical device present signature. */ 1527 /* Physical device present signature. */
1528 if (!DEV_OK(link)) 1528 if (!pcmcia_dev_present(link))
1529 return -ENODEV; 1529 return -ENODEV;
1530 1530
1531 /* okay */ 1531 /* okay */