[PATCH] pcmcia: use bitfield instead of p_state and state

Instead of the two status values struct pcmcia_device->p_state and state,
use descriptive bitfields. Most value-checking in drivers was invalid, as
the core now only calls the ->remove() (a.k.a. detach) function in case the
attachement _and_ configuration was successful.

Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

10 files changed, 56 insertions, 125 deletions

diff --git a/drivers/net/pcmcia/3c574_cs.c b/drivers/net/pcmcia/3c574_cs.c
index 4611469fdff9..70e3cca09787 100644
--- a/drivers/net/pcmcia/3c574_cs.c
+++ b/drivers/net/pcmcia/3c574_cs.c
@@ -296,7 +296,6 @@ static int tc574_probe(struct pcmcia_device *link)
         dev->watchdog_timeo = TX_TIMEOUT;
 #endif
 
-        link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
         return tc574_config(link);
 } /* tc574_attach */
 
@@ -318,8 +317,7 @@ static void tc574_detach(struct pcmcia_device *link)
         if (link->dev_node)
                 unregister_netdev(dev);
 
-        if (link->state & DEV_CONFIG)
-                tc574_release(link);
+        tc574_release(link);
 
         free_netdev(dev);
 } /* tc574_detach */
@@ -363,9 +361,6 @@ static int tc574_config(struct pcmcia_device *link)
         link->conf.ConfigBase = parse.config.base;
         link->conf.Present = parse.config.rmask[0];
 
-        /* Configure card */
-        link->state |= DEV_CONFIG;
-
         link->io.IOAddrLines = 16;
         for (i = j = 0; j < 0x400; j += 0x20) {
                 link->io.BasePort1 = j ^ 0x300;
@@ -464,7 +459,6 @@ static int tc574_config(struct pcmcia_device *link)
                 }
         }
 
-        link->state &= ~DEV_CONFIG_PENDING;
         link->dev_node = &lp->node;
         SET_NETDEV_DEV(dev, &handle_to_dev(link));
 
@@ -509,7 +503,7 @@ static int tc574_suspend(struct pcmcia_device *link)
 {
         struct net_device *dev = link->priv;
 
-        if ((link->state & DEV_CONFIG) && (link->open))
+        if (link->open)
                 netif_device_detach(dev);
 
         return 0;
@@ -519,7 +513,7 @@ static int tc574_resume(struct pcmcia_device *link)
 {
         struct net_device *dev = link->priv;
 
-        if ((link->state & DEV_CONFIG) && (link->open)) {
+        if (link->open) {
                 tc574_reset(dev);
                 netif_device_attach(dev);
         }
diff --git a/drivers/net/pcmcia/3c589_cs.c b/drivers/net/pcmcia/3c589_cs.c
index 160d48a8ed88..3d05f66e9c70 100644
--- a/drivers/net/pcmcia/3c589_cs.c
+++ b/drivers/net/pcmcia/3c589_cs.c
@@ -211,7 +211,6 @@ static int tc589_probe(struct pcmcia_device *link)
 #endif
     SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);
 
-    link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
     return tc589_config(link);
 } /* tc589_attach */
 
@@ -233,8 +232,7 @@ static void tc589_detach(struct pcmcia_device *link)
     if (link->dev_node)
         unregister_netdev(dev);
 
-    if (link->state & DEV_CONFIG)
-        tc589_release(link);
+    tc589_release(link);
 
     free_netdev(dev);
 } /* tc589_detach */
@@ -285,9 +283,6 @@ static int tc589_config(struct pcmcia_device *link)
                    "3Com card??\n");
         multi = (le16_to_cpu(buf[1]) == PRODID_3COM_3C562);
     }
-    
-    /* Configure card */
-    link->state |= DEV_CONFIG;
 
     /* For the 3c562, the base address must be xx00-xx7f */
     link->io.IOAddrLines = 16;
@@ -338,7 +333,6 @@ static int tc589_config(struct pcmcia_device *link)
         printk(KERN_ERR "3c589_cs: invalid if_port requested\n");
     
     link->dev_node = &lp->node;
-    link->state &= ~DEV_CONFIG_PENDING;
     SET_NETDEV_DEV(dev, &handle_to_dev(link));
 
     if (register_netdev(dev) != 0) {
@@ -383,7 +377,7 @@ static int tc589_suspend(struct pcmcia_device *link)
 {
         struct net_device *dev = link->priv;
 
-        if ((link->state & DEV_CONFIG) && (link->open))
+        if (link->open)
                 netif_device_detach(dev);
 
         return 0;
@@ -393,7 +387,7 @@ static int tc589_resume(struct pcmcia_device *link)
 {
         struct net_device *dev = link->priv;
 
-        if ((link->state & DEV_CONFIG) && (link->open)) {
+        if (link->open) {
                 tc589_reset(dev);
                 netif_device_attach(dev);
         }
diff --git a/drivers/net/pcmcia/axnet_cs.c b/drivers/net/pcmcia/axnet_cs.c
index f6ca85d77c7d..0f1219c11853 100644
--- a/drivers/net/pcmcia/axnet_cs.c
+++ b/drivers/net/pcmcia/axnet_cs.c
@@ -168,7 +168,6 @@ static int axnet_probe(struct pcmcia_device *link)
     dev->do_ioctl = &axnet_ioctl;
     SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);
 
-    link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
     return axnet_config(link);
 } /* axnet_attach */
 
@@ -190,8 +189,7 @@ static void axnet_detach(struct pcmcia_device *link)
     if (link->dev_node)
         unregister_netdev(dev);
 
-    if (link->state & DEV_CONFIG)
-        axnet_release(link);
+    axnet_release(link);
 
     free_netdev(dev);
 } /* axnet_detach */
@@ -309,9 +307,6 @@ static int axnet_config(struct pcmcia_device *link)
     /* don't trust the CIS on this; Linksys got it wrong */
     link->conf.Present = 0x63;
 
-    /* Configure card */
-    link->state |= DEV_CONFIG;
-
     tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
     tuple.Attributes = 0;
     CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
@@ -402,7 +397,6 @@ static int axnet_config(struct pcmcia_device *link)
 
     info->phy_id = (i < 32) ? i : -1;
     link->dev_node = &info->node;
-    link->state &= ~DEV_CONFIG_PENDING;
     SET_NETDEV_DEV(dev, &handle_to_dev(link));
 
     if (register_netdev(dev) != 0) {
@@ -429,7 +423,6 @@ cs_failed:
     cs_error(link, last_fn, last_ret);
 failed:
     axnet_release(link);
-    link->state &= ~DEV_CONFIG_PENDING;
     return -ENODEV;
 } /* axnet_config */
 
@@ -450,8 +443,8 @@ static int axnet_suspend(struct pcmcia_device *link)
 {
         struct net_device *dev = link->priv;
 
-        if ((link->state & DEV_CONFIG) && (link->open))
-                        netif_device_detach(dev);
+        if (link->open)
+                netif_device_detach(dev);
 
         return 0;
 }
@@ -460,7 +453,7 @@ static int axnet_resume(struct pcmcia_device *link)
 {
         struct net_device *dev = link->priv;
 
-        if ((link->state & DEV_CONFIG) && (link->open)) {
+        if (link->open) {
                 axnet_reset_8390(dev);
                 AX88190_init(dev, 1);
                 netif_device_attach(dev);
diff --git a/drivers/net/pcmcia/com20020_cs.c b/drivers/net/pcmcia/com20020_cs.c
index a7d675bc6051..441de824ab6b 100644
--- a/drivers/net/pcmcia/com20020_cs.c
+++ b/drivers/net/pcmcia/com20020_cs.c
@@ -178,7 +178,6 @@ static int com20020_probe(struct pcmcia_device *p_dev)
     p_dev->irq.Instance = info->dev = dev;
     p_dev->priv = info;
 
-    p_dev->state |= DEV_PRESENT;
     return com20020_config(p_dev);
 
 fail_alloc_dev:
@@ -218,8 +217,7 @@ static void com20020_detach(struct pcmcia_device *link)
             free_irq(dev->irq, dev);
     }
 
-    if (link->state & DEV_CONFIG)
-        com20020_release(link);
+    com20020_release(link);
 
     /* Unlink device structure, free bits */
     DEBUG(1,"unlinking...\n");
@@ -276,9 +274,6 @@ static int com20020_config(struct pcmcia_device *link)
     CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
     link->conf.ConfigBase = parse.config.base;
 
-    /* Configure card */
-    link->state |= DEV_CONFIG;
-
     DEBUG(1,"arcnet: baseport1 is %Xh\n", link->io.BasePort1);
     i = !CS_SUCCESS;
     if (!link->io.BasePort1)
@@ -328,7 +323,6 @@ static int com20020_config(struct pcmcia_device *link)
     lp->card_flags = ARC_CAN_10MBIT; /* pretend all of them can 10Mbit */
 
     link->dev_node = &info->node;
-    link->state &= ~DEV_CONFIG_PENDING;
     SET_NETDEV_DEV(dev, &handle_to_dev(link));
 
     i = com20020_found(dev, 0); /* calls register_netdev */
@@ -372,7 +366,7 @@ static int com20020_suspend(struct pcmcia_device *link)
         com20020_dev_t *info = link->priv;
         struct net_device *dev = info->dev;
 
-        if ((link->state & DEV_CONFIG) && (link->open))
+        if (link->open)
                 netif_device_detach(dev);
 
         return 0;
@@ -383,7 +377,7 @@ static int com20020_resume(struct pcmcia_device *link)
         com20020_dev_t *info = link->priv;
         struct net_device *dev = info->dev;
 
-        if ((link->state & DEV_CONFIG) && (link->open)) {
+        if (link->open) {
                 int ioaddr = dev->base_addr;
                 struct arcnet_local *lp = dev->priv;
                 ARCRESET;
diff --git a/drivers/net/pcmcia/fmvj18x_cs.c b/drivers/net/pcmcia/fmvj18x_cs.c
index d9c83b290095..7cb20b6b9348 100644
--- a/drivers/net/pcmcia/fmvj18x_cs.c
+++ b/drivers/net/pcmcia/fmvj18x_cs.c
@@ -272,7 +272,6 @@ static int fmvj18x_probe(struct pcmcia_device *link)
 #endif
     SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);
 
-    link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
     return fmvj18x_config(link);
 } /* fmvj18x_attach */
 
@@ -287,8 +286,7 @@ static void fmvj18x_detach(struct pcmcia_device *link)
     if (link->dev_node)
         unregister_netdev(dev);
 
-    if (link->state & DEV_CONFIG)
-        fmvj18x_release(link);
+    fmvj18x_release(link);
 
     free_netdev(dev);
 } /* fmvj18x_detach */
@@ -363,9 +361,6 @@ static int fmvj18x_config(struct pcmcia_device *link)
     tuple.TupleOffset = 0;
     CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
     CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
-    
-    /* Configure card */
-    link->state |= DEV_CONFIG;
 
     link->conf.ConfigBase = parse.config.base; 
     link->conf.Present = parse.config.rmask[0];
@@ -532,7 +527,6 @@ static int fmvj18x_config(struct pcmcia_device *link)
 
     lp->cardtype = cardtype;
     link->dev_node = &lp->node;
-    link->state &= ~DEV_CONFIG_PENDING;
     SET_NETDEV_DEV(dev, &handle_to_dev(link));
 
     if (register_netdev(dev) != 0) {
@@ -557,7 +551,6 @@ cs_failed:
     cs_error(link, last_fn, last_ret);
 failed:
     fmvj18x_release(link);
-    link->state &= ~DEV_CONFIG_PENDING;
     return -ENODEV;
 } /* fmvj18x_config */
 /*====================================================================*/
@@ -668,7 +661,7 @@ static int fmvj18x_suspend(struct pcmcia_device *link)
 {
         struct net_device *dev = link->priv;
 
-        if ((link->state & DEV_CONFIG) && (link->open))
+        if (link->open)
                 netif_device_detach(dev);
 
         return 0;
@@ -678,7 +671,7 @@ static int fmvj18x_resume(struct pcmcia_device *link)
 {
         struct net_device *dev = link->priv;
 
-        if ((link->state & DEV_CONFIG) && (link->open)) {
+        if (link->open) {
                 fjn_reset(dev);
                 netif_device_attach(dev);
         }
diff --git a/drivers/net/pcmcia/ibmtr_cs.c b/drivers/net/pcmcia/ibmtr_cs.c
index e038d9278a59..b8fe70b85641 100644
--- a/drivers/net/pcmcia/ibmtr_cs.c
+++ b/drivers/net/pcmcia/ibmtr_cs.c
@@ -173,7 +173,6 @@ static int ibmtr_attach(struct pcmcia_device *link)
 
     SET_ETHTOOL_OPS(dev, &netdev_ethtool_ops);
 
-    link->state |= DEV_PRESENT;
     return ibmtr_config(link);
 } /* ibmtr_attach */
 
@@ -200,8 +199,8 @@ static void ibmtr_detach(struct pcmcia_device *link)
         struct tok_info *ti = netdev_priv(dev);
         del_timer_sync(&(ti->tr_timer));
     }
-    if (link->state & DEV_CONFIG)
-        ibmtr_release(link);
+
+    ibmtr_release(link);
 
     free_netdev(dev);
     kfree(info);
@@ -241,10 +240,6 @@ static int ibmtr_config(struct pcmcia_device *link)
     CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
     CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
     link->conf.ConfigBase = parse.config.base;
-
-    /* Configure card */
-    link->state |= DEV_CONFIG;
-
     link->conf.ConfigIndex = 0x61;
 
     /* Determine if this is PRIMARY or ALTERNATE. */
@@ -301,7 +296,6 @@ static int ibmtr_config(struct pcmcia_device *link)
     ibmtr_hw_setup(dev, mmiobase);
 
     link->dev_node = &info->node;
-    link->state &= ~DEV_CONFIG_PENDING;
     SET_NETDEV_DEV(dev, &handle_to_dev(link));
 
     i = ibmtr_probe_card(dev);
@@ -358,7 +352,7 @@ static int ibmtr_suspend(struct pcmcia_device *link)
         ibmtr_dev_t *info = link->priv;
         struct net_device *dev = info->dev;
 
-        if ((link->state & DEV_CONFIG) && (link->open))
+        if (link->open)
                 netif_device_detach(dev);
 
         return 0;
@@ -369,7 +363,7 @@ static int ibmtr_resume(struct pcmcia_device *link)
         ibmtr_dev_t *info = link->priv;
         struct net_device *dev = info->dev;
 
-        if ((link->state & DEV_CONFIG) && (link->open)) {
+        if (link->open) {
                 ibmtr_probe(dev);       /* really? */
                 netif_device_attach(dev);
         }
diff --git a/drivers/net/pcmcia/nmclan_cs.c b/drivers/net/pcmcia/nmclan_cs.c
index ea8a62e629a4..fd191143cb2f 100644
--- a/drivers/net/pcmcia/nmclan_cs.c
+++ b/drivers/net/pcmcia/nmclan_cs.c
@@ -487,7 +487,6 @@ static int nmclan_probe(struct pcmcia_device *link)
     dev->watchdog_timeo = TX_TIMEOUT;
 #endif
 
-    link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
     return nmclan_config(link);
 } /* nmclan_attach */
 
@@ -508,8 +507,7 @@ static void nmclan_detach(struct pcmcia_device *link)
     if (link->dev_node)
         unregister_netdev(dev);
 
-    if (link->state & DEV_CONFIG)
-        nmclan_release(link);
+    nmclan_release(link);
 
     free_netdev(dev);
 } /* nmclan_detach */
@@ -675,9 +673,6 @@ static int nmclan_config(struct pcmcia_device *link)
   CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
   link->conf.ConfigBase = parse.config.base;
 
-  /* Configure card */
-  link->state |= DEV_CONFIG;
-
   CS_CHECK(RequestIO, pcmcia_request_io(link, &link->io));
   CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
   CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
@@ -707,7 +702,6 @@ static int nmclan_config(struct pcmcia_device *link)
     } else {
       printk(KERN_NOTICE "nmclan_cs: mace id not found: %x %x should"
              " be 0x40 0x?9\n", sig[0], sig[1]);
-      link->state &= ~DEV_CONFIG_PENDING;
       return -ENODEV;
     }
   }
@@ -722,7 +716,6 @@ static int nmclan_config(struct pcmcia_device *link)
     printk(KERN_NOTICE "nmclan_cs: invalid if_port requested\n");
 
   link->dev_node = &lp->node;
-  link->state &= ~DEV_CONFIG_PENDING;
   SET_NETDEV_DEV(dev, &handle_to_dev(link));
 
   i = register_netdev(dev);
@@ -763,7 +756,7 @@ static int nmclan_suspend(struct pcmcia_device *link)
 {
         struct net_device *dev = link->priv;
 
-        if ((link->state & DEV_CONFIG) && (link->open))
+        if (link->open)
                 netif_device_detach(dev);
 
         return 0;
@@ -773,7 +766,7 @@ static int nmclan_resume(struct pcmcia_device *link)
 {
         struct net_device *dev = link->priv;
 
-        if ((link->state & DEV_CONFIG) && (link->open)) {
+        if (link->open) {
                 nmclan_reset(dev);
                 netif_device_attach(dev);
         }
diff --git a/drivers/net/pcmcia/pcnet_cs.c b/drivers/net/pcmcia/pcnet_cs.c
index d840c0f03ea9..d9661410f2ff 100644
--- a/drivers/net/pcmcia/pcnet_cs.c
+++ b/drivers/net/pcmcia/pcnet_cs.c
@@ -264,7 +264,6 @@ static int pcnet_probe(struct pcmcia_device *link)
     dev->stop = &pcnet_close;
     dev->set_config = &set_config;
 
-    link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
     return pcnet_config(link);
 } /* pcnet_attach */
 
@@ -286,8 +285,7 @@ static void pcnet_detach(struct pcmcia_device *link)
         if (link->dev_node)
                 unregister_netdev(dev);
 
-        if (link->state & DEV_CONFIG)
-                pcnet_release(link);
+        pcnet_release(link);
 
         free_netdev(dev);
 } /* pcnet_detach */
@@ -538,9 +536,6 @@ static int pcnet_config(struct pcmcia_device *link)
     link->conf.ConfigBase = parse.config.base;
     link->conf.Present = parse.config.rmask[0];
 
-    /* Configure card */
-    link->state |= DEV_CONFIG;
-
     tuple.DesiredTuple = CISTPL_MANFID;
     tuple.Attributes = TUPLE_RETURN_COMMON;
     if ((pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS) &&
@@ -667,7 +662,6 @@ static int pcnet_config(struct pcmcia_device *link)
     }
 
     link->dev_node = &info->node;
-    link->state &= ~DEV_CONFIG_PENDING;
     SET_NETDEV_DEV(dev, &handle_to_dev(link));
 
 #ifdef CONFIG_NET_POLL_CONTROLLER
@@ -705,7 +699,6 @@ cs_failed:
     cs_error(link, last_fn, last_ret);
 failed:
     pcnet_release(link);
-    link->state &= ~DEV_CONFIG_PENDING;
     return -ENODEV;
 } /* pcnet_config */
 
@@ -742,7 +735,7 @@ static int pcnet_suspend(struct pcmcia_device *link)
 {
         struct net_device *dev = link->priv;
 
-        if ((link->state & DEV_CONFIG) && (link->open))
+        if (link->open)
                 netif_device_detach(dev);
 
         return 0;
@@ -752,7 +745,7 @@ static int pcnet_resume(struct pcmcia_device *link)
 {
         struct net_device *dev = link->priv;
 
-        if ((link->state & DEV_CONFIG) && (link->open)) {
+        if (link->open) {
                 pcnet_reset_8390(dev);
                 NS8390_init(dev, 1);
                 netif_device_attach(dev);
diff --git a/drivers/net/pcmcia/smc91c92_cs.c b/drivers/net/pcmcia/smc91c92_cs.c
index 3252c1dc9ee7..7d565f26a3bf 100644
--- a/drivers/net/pcmcia/smc91c92_cs.c
+++ b/drivers/net/pcmcia/smc91c92_cs.c
@@ -356,7 +356,6 @@ static int smc91c92_probe(struct pcmcia_device *link)
     smc->mii_if.phy_id_mask = 0x1f;
     smc->mii_if.reg_num_mask = 0x1f;
 
-    link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
     return smc91c92_config(link);
 } /* smc91c92_attach */
 
@@ -378,8 +377,7 @@ static void smc91c92_detach(struct pcmcia_device *link)
     if (link->dev_node)
         unregister_netdev(dev);
 
-    if (link->state & DEV_CONFIG)
-        smc91c92_release(link);
+    smc91c92_release(link);
 
     free_netdev(dev);
 } /* smc91c92_detach */
@@ -862,7 +860,7 @@ static int smc91c92_suspend(struct pcmcia_device *link)
 {
         struct net_device *dev = link->priv;
 
-        if ((link->state & DEV_CONFIG) && (link->open))
+        if (link->open)
                 netif_device_detach(dev);
 
         return 0;
@@ -874,33 +872,31 @@ static int smc91c92_resume(struct pcmcia_device *link)
         struct smc_private *smc = netdev_priv(dev);
         int i;
 
-        if (link->state & DEV_CONFIG) {
-                if ((smc->manfid == MANFID_MEGAHERTZ) &&
-                    (smc->cardid == PRODID_MEGAHERTZ_EM3288))
-                        mhz_3288_power(link);
-                if (smc->manfid == MANFID_MOTOROLA)
-                        mot_config(link);
-                if ((smc->manfid == MANFID_OSITECH) &&
-                    (smc->cardid != PRODID_OSITECH_SEVEN)) {
-                        /* Power up the card and enable interrupts */
-                        set_bits(0x0300, dev->base_addr-0x10+OSITECH_AUI_PWR);
-                        set_bits(0x0300, dev->base_addr-0x10+OSITECH_RESET_ISR);
-                }
-                if (((smc->manfid == MANFID_OSITECH) &&
-                     (smc->cardid == PRODID_OSITECH_SEVEN)) ||
-                    ((smc->manfid == MANFID_PSION) &&
-                     (smc->cardid == PRODID_PSION_NET100))) {
-                        /* Download the Seven of Diamonds firmware */
-                        for (i = 0; i < sizeof(__Xilinx7OD); i++) {
-                                outb(__Xilinx7OD[i], link->io.BasePort1+2);
-                                udelay(50);
-                        }
-                }
-                if (link->open) {
-                        smc_reset(dev);
-                        netif_device_attach(dev);
+        if ((smc->manfid == MANFID_MEGAHERTZ) &&
+            (smc->cardid == PRODID_MEGAHERTZ_EM3288))
+                mhz_3288_power(link);
+        if (smc->manfid == MANFID_MOTOROLA)
+                mot_config(link);
+        if ((smc->manfid == MANFID_OSITECH) &&
+            (smc->cardid != PRODID_OSITECH_SEVEN)) {
+                /* Power up the card and enable interrupts */
+                set_bits(0x0300, dev->base_addr-0x10+OSITECH_AUI_PWR);
+                set_bits(0x0300, dev->base_addr-0x10+OSITECH_RESET_ISR);
+        }
+        if (((smc->manfid == MANFID_OSITECH) &&
+             (smc->cardid == PRODID_OSITECH_SEVEN)) ||
+            ((smc->manfid == MANFID_PSION) &&
+             (smc->cardid == PRODID_PSION_NET100))) {
+                /* Download the Seven of Diamonds firmware */
+                for (i = 0; i < sizeof(__Xilinx7OD); i++) {
+                        outb(__Xilinx7OD[i], link->io.BasePort1+2);
+                        udelay(50);
                 }
         }
+        if (link->open) {
+                smc_reset(dev);
+                netif_device_attach(dev);
+        }
 
         return 0;
 }
@@ -1010,9 +1006,6 @@ static int smc91c92_config(struct pcmcia_device *link)
         smc->cardid = parse->manfid.card;
     }
 
-    /* Configure card */
-    link->state |= DEV_CONFIG;
-
     if ((smc->manfid == MANFID_OSITECH) &&
         (smc->cardid != PRODID_OSITECH_SEVEN)) {
         i = osi_config(link);
@@ -1108,7 +1101,6 @@ static int smc91c92_config(struct pcmcia_device *link)
     }
 
     link->dev_node = &smc->node;
-    link->state &= ~DEV_CONFIG_PENDING;
     SET_NETDEV_DEV(dev, &handle_to_dev(link));
 
     if (register_netdev(dev) != 0) {
@@ -1149,7 +1141,6 @@ config_undo:
     unregister_netdev(dev);
 config_failed:                  /* CS_EXIT_TEST() calls jump to here... */
     smc91c92_release(link);
-    link->state &= ~DEV_CONFIG_PENDING;
     kfree(cfg_mem);
     return -ENODEV;
 } /* smc91c92_config */
diff --git a/drivers/net/pcmcia/xirc2ps_cs.c b/drivers/net/pcmcia/xirc2ps_cs.c
index 77bf4e3a6139..0141c5037f41 100644
--- a/drivers/net/pcmcia/xirc2ps_cs.c
+++ b/drivers/net/pcmcia/xirc2ps_cs.c
@@ -591,7 +591,6 @@ xirc2ps_probe(struct pcmcia_device *link)
     dev->watchdog_timeo = TX_TIMEOUT;
 #endif
 
-    link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
     return xirc2ps_config(link);
 } /* xirc2ps_attach */
 
@@ -612,8 +611,7 @@ xirc2ps_detach(struct pcmcia_device *link)
     if (link->dev_node)
         unregister_netdev(dev);
 
-    if (link->state & DEV_CONFIG)
-        xirc2ps_release(link);
+    xirc2ps_release(link);
 
     free_netdev(dev);
 } /* xirc2ps_detach */
@@ -843,9 +841,6 @@ xirc2ps_config(struct pcmcia_device * link)
     for (i=0; i < 6; i++)
         dev->dev_addr[i] = node_id->id[i];
 
-    /* Configure card */
-    link->state |= DEV_CONFIG;
-
     link->io.IOAddrLines =10;
     link->io.Attributes1 = IO_DATA_PATH_WIDTH_16;
     link->irq.Attributes = IRQ_HANDLE_PRESENT;
@@ -1041,7 +1036,6 @@ xirc2ps_config(struct pcmcia_device * link)
         do_reset(dev, 1); /* a kludge to make the cem56 work */
 
     link->dev_node = &local->node;
-    link->state &= ~DEV_CONFIG_PENDING;
     SET_NETDEV_DEV(dev, &handle_to_dev(link));
 
     if ((err=register_netdev(dev))) {
@@ -1062,14 +1056,12 @@ xirc2ps_config(struct pcmcia_device * link)
     return 0;
 
   config_error:
-    link->state &= ~DEV_CONFIG_PENDING;
     xirc2ps_release(link);
     return -ENODEV;
 
   cis_error:
     printk(KNOT_XIRC "unable to parse CIS\n");
   failure:
-    link->state &= ~DEV_CONFIG_PENDING;
     return -ENODEV;
 } /* xirc2ps_config */
 
@@ -1099,9 +1091,9 @@ static int xirc2ps_suspend(struct pcmcia_device *link)
 {
         struct net_device *dev = link->priv;
 
-        if ((link->state & DEV_CONFIG) && (link->open)) {
-                        netif_device_detach(dev);
-                        do_powerdown(dev);
+        if (link->open) {
+                netif_device_detach(dev);
+                do_powerdown(dev);
         }
 
         return 0;
@@ -1111,7 +1103,7 @@ static int xirc2ps_resume(struct pcmcia_device *link)
 {
         struct net_device *dev = link->priv;
 
-        if ((link->state & DEV_CONFIG) && (link->open)) {
+        if (link->open) {
                 do_reset(dev,1);
                 netif_device_attach(dev);
         }