11 files changed, 41 insertions, 259 deletions

diff --git a/drivers/net/wireless/airo_cs.c b/drivers/net/wireless/airo_cs.c
index f6036fb42319..33bdc6a84e81 100644
--- a/drivers/net/wireless/airo_cs.c
+++ b/drivers/net/wireless/airo_cs.c
@@ -75,42 +75,7 @@ static void airo_release(struct pcmcia_device *link);
 
 static void airo_detach(struct pcmcia_device *p_dev);
 
-/*
-   You'll also need to prototype all the functions that will actually
-   be used to talk to your device.  See 'pcmem_cs' for a good example
-   of a fully self-sufficient driver; the other drivers rely more or
-   less on other parts of the kernel.
-*/
-
-/*
-   A linked list of "instances" of the  aironet device.  Each actual
-   PCMCIA card corresponds to one device instance, and is described
-   by one struct pcmcia_device structure (defined in ds.h).
-
-   You may not want to use a linked list for this -- for example, the
-   memory card driver uses an array of struct pcmcia_device pointers,
-   where minor device numbers are used to derive the corresponding
-   array index.
-*/
-
-/*
-   A driver needs to provide a dev_node_t structure for each device
-   on a card.  In some cases, there is only one device per card (for
-   example, ethernet cards, modems).  In other cases, there may be
-   many actual or logical devices (SCSI adapters, memory cards with
-   multiple partitions).  The dev_node_t structures need to be kept
-   in a linked list starting at the 'dev' field of a struct pcmcia_device
-   structure.  We allocate them in the card's private data structure,
-   because they generally shouldn't be allocated dynamically.
-
-   In this case, we also provide a flag to indicate if a device is
-   "stopped" due to a power management event, or card ejection.  The
-   device IO routines can use a flag like this to throttle IO to a
-   card that is not ready to accept it.
-*/
-
 typedef struct local_info_t {
-        dev_node_t      node;
         struct net_device *eth_dev;
 } local_info_t;
 
@@ -132,10 +97,6 @@ static int airo_probe(struct pcmcia_device *p_dev)
 
         dev_dbg(&p_dev->dev, "airo_attach()\n");
 
-        /* Interrupt setup */
-        p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
-        p_dev->irq.Handler = NULL;
-
         /*
           General socket configuration defaults can go here.  In this
           client, we assume very little, and rely on the CIS for almost
@@ -212,9 +173,7 @@ static int airo_cs_config_check(struct pcmcia_device *p_dev,
         else if (dflt->vpp1.present & (1<<CISTPL_POWER_VNOM))
                 p_dev->conf.Vpp = dflt->vpp1.param[CISTPL_POWER_VNOM]/10000;
 
-        /* Do we need to allocate an interrupt? */
-        if (cfg->irq.IRQInfo1 || dflt->irq.IRQInfo1)
-                p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
+        p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
 
         /* IO window settings */
         p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0;
@@ -300,16 +259,8 @@ static int airo_config(struct pcmcia_device *link)
         if (ret)
                 goto failed;
 
-        /*
-          Allocate an interrupt line.  Note that this does not assign a
-          handler to the interrupt, unless the 'Handler' member of the
-          irq structure is initialized.
-        */
-        if (link->conf.Attributes & CONF_ENABLE_IRQ) {
-                ret = pcmcia_request_irq(link, &link->irq);
-                if (ret)
-                        goto failed;
-        }
+        if (!link->irq)
+                goto failed;
 
         /*
           This actually configures the PCMCIA socket -- setting up
@@ -320,26 +271,17 @@ static int airo_config(struct pcmcia_device *link)
         if (ret)
                 goto failed;
         ((local_info_t *)link->priv)->eth_dev =
-                init_airo_card(link->irq.AssignedIRQ,
+                init_airo_card(link->irq,
                                link->io.BasePort1, 1, &link->dev);
         if (!((local_info_t *)link->priv)->eth_dev)
                 goto failed;
 
-        /*
-          At this point, the dev_node_t structure(s) need to be
-          initialized and arranged in a linked list at link->dev_node.
-        */
-        strcpy(dev->node.dev_name, ((local_info_t *)link->priv)->eth_dev->name);
-        dev->node.major = dev->node.minor = 0;
-        link->dev_node = &dev->node;
-
         /* Finally, report what we've done */
-        printk(KERN_INFO "%s: index 0x%02x: ",
-               dev->node.dev_name, link->conf.ConfigIndex);
+        dev_info(&link->dev, "index 0x%02x: ",
+               link->conf.ConfigIndex);
         if (link->conf.Vpp)
                 printk(", Vpp %d.%d", link->conf.Vpp/10, link->conf.Vpp%10);
-        if (link->conf.Attributes & CONF_ENABLE_IRQ)
-                printk(", irq %d", link->irq.AssignedIRQ);
+        printk(", irq %d", link->irq);
         if (link->io.NumPorts1)
                 printk(", io 0x%04x-0x%04x", link->io.BasePort1,
                        link->io.BasePort1+link->io.NumPorts1-1);
diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c
index 32407911842f..c2746fc7f2be 100644
--- a/drivers/net/wireless/atmel_cs.c
+++ b/drivers/net/wireless/atmel_cs.c
@@ -85,41 +85,7 @@ static void atmel_release(struct pcmcia_device *link);
 
 static void atmel_detach(struct pcmcia_device *p_dev);
 
-/*
-   You'll also need to prototype all the functions that will actually
-   be used to talk to your device.  See 'pcmem_cs' for a good example
-   of a fully self-sufficient driver; the other drivers rely more or
-   less on other parts of the kernel.
-*/
-
-/*
-   A linked list of "instances" of the  atmelnet device.  Each actual
-   PCMCIA card corresponds to one device instance, and is described
-   by one struct pcmcia_device structure (defined in ds.h).
-
-   You may not want to use a linked list for this -- for example, the
-   memory card driver uses an array of struct pcmcia_device pointers, where minor
-   device numbers are used to derive the corresponding array index.
-*/
-
-/*
-   A driver needs to provide a dev_node_t structure for each device
-   on a card.  In some cases, there is only one device per card (for
-   example, ethernet cards, modems).  In other cases, there may be
-   many actual or logical devices (SCSI adapters, memory cards with
-   multiple partitions).  The dev_node_t structures need to be kept
-   in a linked list starting at the 'dev' field of a struct pcmcia_device
-   structure.  We allocate them in the card's private data structure,
-   because they generally shouldn't be allocated dynamically.
-
-   In this case, we also provide a flag to indicate if a device is
-   "stopped" due to a power management event, or card ejection.  The
-   device IO routines can use a flag like this to throttle IO to a
-   card that is not ready to accept it.
-*/
-
 typedef struct local_info_t {
-        dev_node_t      node;
         struct net_device *eth_dev;
 } local_info_t;
 
@@ -141,10 +107,6 @@ static int atmel_probe(struct pcmcia_device *p_dev)
 
         dev_dbg(&p_dev->dev, "atmel_attach()\n");
 
-        /* Interrupt setup */
-        p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
-        p_dev->irq.Handler = NULL;
-
         /*
           General socket configuration defaults can go here.  In this
           client, we assume very little, and rely on the CIS for almost
@@ -226,9 +188,7 @@ static int atmel_config_check(struct pcmcia_device *p_dev,
         else if (dflt->vpp1.present & (1<<CISTPL_POWER_VNOM))
                 p_dev->conf.Vpp = dflt->vpp1.param[CISTPL_POWER_VNOM]/10000;
 
-        /* Do we need to allocate an interrupt? */
-        if (cfg->irq.IRQInfo1 || dflt->irq.IRQInfo1)
-                p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
+        p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
 
         /* IO window settings */
         p_dev->io.NumPorts1 = p_dev->io.NumPorts2 = 0;
@@ -278,15 +238,9 @@ static int atmel_config(struct pcmcia_device *link)
         if (pcmcia_loop_config(link, atmel_config_check, NULL))
                 goto failed;
 
-        /*
-          Allocate an interrupt line.  Note that this does not assign a
-          handler to the interrupt, unless the 'Handler' member of the
-          irq structure is initialized.
-        */
-        if (link->conf.Attributes & CONF_ENABLE_IRQ) {
-                ret = pcmcia_request_irq(link, &link->irq);
-                if (ret)
-                        goto failed;
+        if (!link->irq) {
+                dev_err(&link->dev, "atmel: cannot assign IRQ: check that CONFIG_ISA is set in kernel config.");
+                goto failed;
         }
 
         /*
@@ -298,14 +252,8 @@ static int atmel_config(struct pcmcia_device *link)
         if (ret)
                 goto failed;
 
-        if (link->irq.AssignedIRQ == 0) {
-                printk(KERN_ALERT
-                       "atmel: cannot assign IRQ: check that CONFIG_ISA is set in kernel config.");
-                goto failed;
-        }
-
         ((local_info_t*)link->priv)->eth_dev =
-                init_atmel_card(link->irq.AssignedIRQ,
+                init_atmel_card(link->irq,
                                 link->io.BasePort1,
                                 did ? did->driver_info : ATMEL_FW_TYPE_NONE,
                                 &link->dev,
@@ -315,14 +263,6 @@ static int atmel_config(struct pcmcia_device *link)
                         goto failed;
 
 
-        /*
-          At this point, the dev_node_t structure(s) need to be
-          initialized and arranged in a linked list at link->dev_node.
-        */
-        strcpy(dev->node.dev_name, ((local_info_t*)link->priv)->eth_dev->name );
-        dev->node.major = dev->node.minor = 0;
-        link->dev_node = &dev->node;
-
         return 0;
 
  failed:
diff --git a/drivers/net/wireless/b43/pcmcia.c b/drivers/net/wireless/b43/pcmcia.c
index 609e7051e018..0e99b634267c 100644
--- a/drivers/net/wireless/b43/pcmcia.c
+++ b/drivers/net/wireless/b43/pcmcia.c
@@ -98,10 +98,7 @@ static int __devinit b43_pcmcia_probe(struct pcmcia_device *dev)
         if (res != 0)
                 goto err_disable;
 
-        dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
-        dev->irq.Handler = NULL; /* The handler is registered later. */
-        res = pcmcia_request_irq(dev, &dev->irq);
-        if (res != 0)
+        if (!dev->irq)
                 goto err_disable;
 
         res = pcmcia_request_configuration(dev, &dev->conf);
diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index a36501dbbe02..db72461c486b 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -39,7 +39,6 @@ MODULE_PARM_DESC(ignore_cis_vcc, "Ignore broken CIS VCC entry");
 
 /* struct local_info::hw_priv */
 struct hostap_cs_priv {
-        dev_node_t node;
         struct pcmcia_device *link;
         int sandisk_connectplus;
 };
@@ -556,15 +555,7 @@ static int prism2_config_check(struct pcmcia_device *p_dev,
                 p_dev->conf.Vpp = dflt->vpp1.param[CISTPL_POWER_VNOM] / 10000;
 
         /* Do we need to allocate an interrupt? */
-        if (cfg->irq.IRQInfo1 || dflt->irq.IRQInfo1)
-                p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
-        else if (!(p_dev->conf.Attributes & CONF_ENABLE_IRQ)) {
-                /* At least Compaq WL200 does not have IRQInfo1 set,
-                 * but it does not work without interrupts.. */
-                printk(KERN_WARNING "Config has no IRQ info, but trying to "
-                       "enable IRQ anyway..\n");
-                p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
-        }
+        p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
 
         /* IO window settings */
         PDEBUG(DEBUG_EXTRA, "IO window settings: cfg->io.nwin=%d "
@@ -633,21 +624,10 @@ static int prism2_config(struct pcmcia_device *link)
         local = iface->local;
         local->hw_priv = hw_priv;
         hw_priv->link = link;
-        strcpy(hw_priv->node.dev_name, dev->name);
-        link->dev_node = &hw_priv->node;
 
-        /*
-         * Allocate an interrupt line.  Note that this does not assign a
-         * handler to the interrupt, unless the 'Handler' member of the
-         * irq structure is initialized.
-         */
-        if (link->conf.Attributes & CONF_ENABLE_IRQ) {
-                link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
-                link->irq.Handler = prism2_interrupt;
-                ret = pcmcia_request_irq(link, &link->irq);
-                if (ret)
-                        goto failed;
-        }
+        ret = pcmcia_request_irq(link, prism2_interrupt);
+        if (ret)
+                goto failed;
 
         /*
          * This actually configures the PCMCIA socket -- setting up
@@ -658,7 +638,7 @@ static int prism2_config(struct pcmcia_device *link)
         if (ret)
                 goto failed;
 
-        dev->irq = link->irq.AssignedIRQ;
+        dev->irq = link->irq;
         dev->base_addr = link->io.BasePort1;
 
         /* Finally, report what we've done */
@@ -668,7 +648,7 @@ static int prism2_config(struct pcmcia_device *link)
                 printk(", Vpp %d.%d", link->conf.Vpp / 10,
                        link->conf.Vpp % 10);
         if (link->conf.Attributes & CONF_ENABLE_IRQ)
-                printk(", irq %d", link->irq.AssignedIRQ);
+                printk(", irq %d", link->irq);
         if (link->io.NumPorts1)
                 printk(", io 0x%04x-0x%04x", link->io.BasePort1,
                        link->io.BasePort1+link->io.NumPorts1-1);
@@ -682,11 +662,9 @@ static int prism2_config(struct pcmcia_device *link)
         sandisk_enable_wireless(dev);
 
         ret = prism2_hw_config(dev, 1);
-        if (!ret) {
+        if (!ret)
                 ret = hostap_hw_ready(dev);
-                if (ret == 0 && local->ddev)
-                        strcpy(hw_priv->node.dev_name, local->ddev->name);
-        }
+
         return ret;
 
  failed:
diff --git a/drivers/net/wireless/libertas/if_cs.c b/drivers/net/wireless/libertas/if_cs.c
index 6d55439a7b97..08e4e3908003 100644
--- a/drivers/net/wireless/libertas/if_cs.c
+++ b/drivers/net/wireless/libertas/if_cs.c
@@ -777,7 +777,7 @@ static void if_cs_release(struct pcmcia_device *p_dev)
 
         lbs_deb_enter(LBS_DEB_CS);
 
-        free_irq(p_dev->irq.AssignedIRQ, card);
+        free_irq(p_dev->irq, card);
         pcmcia_disable_device(p_dev);
         if (card->iobase)
                 ioport_unmap(card->iobase);
@@ -807,8 +807,7 @@ static int if_cs_ioprobe(struct pcmcia_device *p_dev,
         p_dev->io.NumPorts1 = cfg->io.win[0].len;
 
         /* Do we need to allocate an interrupt? */
-        if (cfg->irq.IRQInfo1)
-                p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
+        p_dev->conf.Attributes |= CONF_ENABLE_IRQ;
 
         /* IO window settings */
         if (cfg->io.nwin != 1) {
@@ -837,9 +836,6 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
         card->p_dev = p_dev;
         p_dev->priv = card;
 
-        p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
-        p_dev->irq.Handler = NULL;
-
         p_dev->conf.Attributes = 0;
         p_dev->conf.IntType = INT_MEMORY_AND_IO;
 
@@ -854,13 +850,8 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
          * a handler to the interrupt, unless the 'Handler' member of
          * the irq structure is initialized.
          */
-        if (p_dev->conf.Attributes & CONF_ENABLE_IRQ) {
-                ret = pcmcia_request_irq(p_dev, &p_dev->irq);
-                if (ret) {
-                        lbs_pr_err("error in pcmcia_request_irq\n");
-                        goto out1;
-                }
-        }
+        if (!p_dev->irq)
+                goto out1;
 
         /* Initialize io access */
         card->iobase = ioport_map(p_dev->io.BasePort1, p_dev->io.NumPorts1);
@@ -883,7 +874,7 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
 
         /* Finally, report what we've done */
         lbs_deb_cs("irq %d, io 0x%04x-0x%04x\n",
-               p_dev->irq.AssignedIRQ, p_dev->io.BasePort1,
+               p_dev->irq, p_dev->io.BasePort1,
                p_dev->io.BasePort1 + p_dev->io.NumPorts1 - 1);
 
         /*
@@ -940,7 +931,7 @@ static int if_cs_probe(struct pcmcia_device *p_dev)
         priv->fw_ready = 1;
 
         /* Now actually get the IRQ */
-        ret = request_irq(p_dev->irq.AssignedIRQ, if_cs_interrupt,
+        ret = request_irq(p_dev->irq, if_cs_interrupt,
                 IRQF_SHARED, DRV_NAME, card);
         if (ret) {
                 lbs_pr_err("error in request_irq\n");
diff --git a/drivers/net/wireless/orinoco/orinoco_cs.c b/drivers/net/wireless/orinoco/orinoco_cs.c
index 1d4ada188eda..03056ab73032 100644
--- a/drivers/net/wireless/orinoco/orinoco_cs.c
+++ b/drivers/net/wireless/orinoco/orinoco_cs.c
@@ -50,7 +50,6 @@ MODULE_PARM_DESC(ignore_cis_vcc, "Allow voltage mismatch between card and socket
  * struct orinoco_private */
 struct orinoco_pccard {
         struct pcmcia_device    *p_dev;
-        dev_node_t node;
 
         /* Used to handle hard reset */
         /* yuck, we need this hack to work around the insanity of the
@@ -119,10 +118,6 @@ orinoco_cs_probe(struct pcmcia_device *link)
         card->p_dev = link;
         link->priv = priv;
 
-        /* Interrupt setup */
-        link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
-        link->irq.Handler = orinoco_interrupt;
-
         /* General socket configuration defaults can go here.  In this
          * client, we assume very little, and rely on the CIS for
          * almost everything.  In most clients, many details (i.e.,
@@ -144,8 +139,7 @@ static void orinoco_cs_detach(struct pcmcia_device *link)
 {
         struct orinoco_private *priv = link->priv;
 
-        if (link->dev_node)
-                orinoco_if_del(priv);
+        orinoco_if_del(priv);
 
         orinoco_cs_release(link);
 
@@ -230,7 +224,6 @@ static int
 orinoco_cs_config(struct pcmcia_device *link)
 {
         struct orinoco_private *priv = link->priv;
-        struct orinoco_pccard *card = priv->card;
         hermes_t *hw = &priv->hw;
         int ret;
         void __iomem *mem;
@@ -258,12 +251,7 @@ orinoco_cs_config(struct pcmcia_device *link)
                 goto failed;
         }
 
-        /*
-         * Allocate an interrupt line.  Note that this does not assign
-         * a handler to the interrupt, unless the 'Handler' member of
-         * the irq structure is initialized.
-         */
-        ret = pcmcia_request_irq(link, &link->irq);
+        ret = pcmcia_request_irq(link, orinoco_interrupt);
         if (ret)
                 goto failed;
 
@@ -285,9 +273,6 @@ orinoco_cs_config(struct pcmcia_device *link)
         if (ret)
                 goto failed;
 
-        /* Ok, we have the configuration, prepare to register the netdev */
-        card->node.major = card->node.minor = 0;
-
         /* Initialise the main driver */
         if (orinoco_init(priv) != 0) {
                 printk(KERN_ERR PFX "orinoco_init() failed\n");
@@ -296,17 +281,11 @@ orinoco_cs_config(struct pcmcia_device *link)
 
         /* Register an interface with the stack */
         if (orinoco_if_add(priv, link->io.BasePort1,
-                           link->irq.AssignedIRQ) != 0) {
+                           link->irq) != 0) {
                 printk(KERN_ERR PFX "orinoco_if_add() failed\n");
                 goto failed;
         }
 
-        /* At this point, the dev_node_t structure(s) needs to be
-         * initialized and arranged in a linked list at link->dev_node. */
-        strcpy(card->node.dev_name, priv->ndev->name);
-        link->dev_node = &card->node; /* link->dev_node being non-NULL is also
-                                       * used to indicate that the
-                                       * net_device has been registered */
         return 0;
 
  failed:
diff --git a/drivers/net/wireless/orinoco/spectrum_cs.c b/drivers/net/wireless/orinoco/spectrum_cs.c
index 59bda240fdc2..41b9ce425855 100644
--- a/drivers/net/wireless/orinoco/spectrum_cs.c
+++ b/drivers/net/wireless/orinoco/spectrum_cs.c
@@ -57,7 +57,6 @@ MODULE_PARM_DESC(ignore_cis_vcc, "Allow voltage mismatch between card and socket
  * struct orinoco_private */
 struct orinoco_pccard {
         struct pcmcia_device    *p_dev;
-        dev_node_t node;
 };
 
 /********************************************************************/
@@ -193,10 +192,6 @@ spectrum_cs_probe(struct pcmcia_device *link)
         card->p_dev = link;
         link->priv = priv;
 
-        /* Interrupt setup */
-        link->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
-        link->irq.Handler = orinoco_interrupt;
-
         /* General socket configuration defaults can go here.  In this
          * client, we assume very little, and rely on the CIS for
          * almost everything.  In most clients, many details (i.e.,
@@ -218,8 +213,7 @@ static void spectrum_cs_detach(struct pcmcia_device *link)
 {
         struct orinoco_private *priv = link->priv;
 
-        if (link->dev_node)
-                orinoco_if_del(priv);
+        orinoco_if_del(priv);
 
         spectrum_cs_release(link);
 
@@ -304,7 +298,6 @@ static int
 spectrum_cs_config(struct pcmcia_device *link)
 {
         struct orinoco_private *priv = link->priv;
-        struct orinoco_pccard *card = priv->card;
         hermes_t *hw = &priv->hw;
         int ret;
         void __iomem *mem;
@@ -332,12 +325,7 @@ spectrum_cs_config(struct pcmcia_device *link)
                 goto failed;
         }
 
-        /*
-         * Allocate an interrupt line.  Note that this does not assign
-         * a handler to the interrupt, unless the 'Handler' member of
-         * the irq structure is initialized.
-         */
-        ret = pcmcia_request_irq(link, &link->irq);
+        ret = pcmcia_request_irq(link, orinoco_interrupt);
         if (ret)
                 goto failed;
 
@@ -359,9 +347,6 @@ spectrum_cs_config(struct pcmcia_device *link)
         if (ret)
                 goto failed;
 
-        /* Ok, we have the configuration, prepare to register the netdev */
-        card->node.major = card->node.minor = 0;
-
         /* Reset card */
         if (spectrum_cs_hard_reset(priv) != 0)
                 goto failed;
@@ -374,17 +359,11 @@ spectrum_cs_config(struct pcmcia_device *link)
 
         /* Register an interface with the stack */
         if (orinoco_if_add(priv, link->io.BasePort1,
-                           link->irq.AssignedIRQ) != 0) {
+                           link->irq) != 0) {
                 printk(KERN_ERR PFX "orinoco_if_add() failed\n");
                 goto failed;
         }
 
-        /* At this point, the dev_node_t structure(s) needs to be
-         * initialized and arranged in a linked list at link->dev_node. */
-        strcpy(card->node.dev_name, priv->ndev->name);
-        link->dev_node = &card->node; /* link->dev_node being non-NULL is also
-                                       * used to indicate that the
-                                       * net_device has been registered */
         return 0;
 
  failed:
diff --git a/drivers/net/wireless/ray_cs.c b/drivers/net/wireless/ray_cs.c
index 11865ea21875..f7d2a34ca531 100644
--- a/drivers/net/wireless/ray_cs.c
+++ b/drivers/net/wireless/ray_cs.c
@@ -51,7 +51,6 @@
 #include <pcmcia/cistpl.h>
 #include <pcmcia/cisreg.h>
 #include <pcmcia/ds.h>
-#include <pcmcia/mem_op.h>
 
 #include <linux/wireless.h>
 #include <net/iw_handler.h>
@@ -321,10 +320,6 @@ static int ray_probe(struct pcmcia_device *p_dev)
         p_dev->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
         p_dev->io.IOAddrLines = 5;
 
-        /* Interrupt setup. For PCMCIA, driver takes what's given */
-        p_dev->irq.Attributes = IRQ_TYPE_DYNAMIC_SHARING;
-        p_dev->irq.Handler = &ray_interrupt;
-
         /* General socket configuration */
         p_dev->conf.Attributes = CONF_ENABLE_IRQ;
         p_dev->conf.IntType = INT_MEMORY_AND_IO;
@@ -383,8 +378,7 @@ static void ray_detach(struct pcmcia_device *link)
         del_timer(&local->timer);
 
         if (link->priv) {
-                if (link->dev_node)
-                        unregister_netdev(dev);
+                unregister_netdev(dev);
                 free_netdev(dev);
         }
         dev_dbg(&link->dev, "ray_cs ray_detach ending\n");
@@ -417,10 +411,10 @@ static int ray_config(struct pcmcia_device *link)
         /* Now allocate an interrupt line.  Note that this does not
            actually assign a handler to the interrupt.
          */
-        ret = pcmcia_request_irq(link, &link->irq);
+        ret = pcmcia_request_irq(link, ray_interrupt);
         if (ret)
                 goto failed;
-        dev->irq = link->irq.AssignedIRQ;
+        dev->irq = link->irq;
 
         /* This actually configures the PCMCIA socket -- setting up
            the I/O windows and the interrupt mapping.
@@ -493,9 +487,6 @@ static int ray_config(struct pcmcia_device *link)
                 return i;
         }
 
-        strcpy(local->node.dev_name, dev->name);
-        link->dev_node = &local->node;
-
         printk(KERN_INFO "%s: RayLink, irq %d, hw_addr %pM\n",
                dev->name, dev->irq, dev->dev_addr);
 
diff --git a/drivers/net/wireless/ray_cs.h b/drivers/net/wireless/ray_cs.h
index 1e23b7f4cca7..9f01ddb19748 100644
--- a/drivers/net/wireless/ray_cs.h
+++ b/drivers/net/wireless/ray_cs.h
@@ -25,7 +25,6 @@ struct beacon_rx {
 typedef struct ray_dev_t {
     int card_status;
     int authentication_state;
-    dev_node_t  node;
     window_handle_t amem_handle;   /* handle to window for attribute memory  */
     window_handle_t rmem_handle;   /* handle to window for rx buffer on card */
     void __iomem *sram;            /* pointer to beginning of shared RAM     */
diff --git a/drivers/net/wireless/wl3501.h b/drivers/net/wireless/wl3501.h
index 8bce1a550a22..8816e371fd0e 100644
--- a/drivers/net/wireless/wl3501.h
+++ b/drivers/net/wireless/wl3501.h
@@ -610,7 +610,6 @@ struct wl3501_card {
         struct iw_statistics            wstats;
         struct iw_spy_data              spy_data;
         struct iw_public_data           wireless_data;
-        struct dev_node_t               node;
         struct pcmcia_device            *p_dev;
 };
 #endif
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c
index 7b9621de239f..5e5d24c1ce2b 100644
--- a/drivers/net/wireless/wl3501_cs.c
+++ b/drivers/net/wireless/wl3501_cs.c
@@ -1451,6 +1451,8 @@ static void wl3501_detach(struct pcmcia_device *link)
         netif_device_detach(dev);
         wl3501_release(link);
 
+        unregister_netdev(dev);
+
         if (link->priv)
                 free_netdev(link->priv);
 
@@ -1897,10 +1899,6 @@ static int wl3501_probe(struct pcmcia_device *p_dev)
         p_dev->io.Attributes1   = IO_DATA_PATH_WIDTH_8;
         p_dev->io.IOAddrLines   = 5;
 
-        /* Interrupt setup */
-        p_dev->irq.Attributes   = IRQ_TYPE_DYNAMIC_SHARING;
-        p_dev->irq.Handler = wl3501_interrupt;
-
         /* General socket configuration */
         p_dev->conf.Attributes  = CONF_ENABLE_IRQ;
         p_dev->conf.IntType     = INT_MEMORY_AND_IO;
@@ -1961,7 +1959,7 @@ static int wl3501_config(struct pcmcia_device *link)
         /* Now allocate an interrupt line. Note that this does not actually
          * assign a handler to the interrupt. */
 
-        ret = pcmcia_request_irq(link, &link->irq);
+        ret = pcmcia_request_irq(link, wl3501_interrupt);
         if (ret)
                 goto failed;
 
@@ -1972,7 +1970,7 @@ static int wl3501_config(struct pcmcia_device *link)
         if (ret)
                 goto failed;
 
-        dev->irq = link->irq.AssignedIRQ;
+        dev->irq = link->irq;
         dev->base_addr = link->io.BasePort1;
         SET_NETDEV_DEV(dev, &link->dev);
         if (register_netdev(dev)) {
@@ -1981,20 +1979,15 @@ static int wl3501_config(struct pcmcia_device *link)
         }
 
         this = netdev_priv(dev);
-        /*
-         * At this point, the dev_node_t structure(s) should be initialized and
-         * arranged in a linked list at link->dev_node.
-         */
-        link->dev_node = &this->node;
 
         this->base_addr = dev->base_addr;
 
         if (!wl3501_get_flash_mac_addr(this)) {
                 printk(KERN_WARNING "%s: Cant read MAC addr in flash ROM?\n",
                        dev->name);
+                unregister_netdev(dev);
                 goto failed;
         }
-        strcpy(this->node.dev_name, dev->name);
 
         for (i = 0; i < 6; i++)
                 dev->dev_addr[i] = ((char *)&this->mac_addr)[i];
@@ -2038,12 +2031,6 @@ failed:
  */
 static void wl3501_release(struct pcmcia_device *link)
 {
-        struct net_device *dev = link->priv;
-
-        /* Unlink the device chain */
-        if (link->dev_node)
-                unregister_netdev(dev);
-
         pcmcia_disable_device(link);
 }