[PATCH] pcmcia: embed dev_link_t into struct pcmcia_device

Embed dev_link_t into struct pcmcia_device(), as they basically address the
same entity. The actual contents of dev_link_t will be cleaned up step by step.
This patch includes a bugfix from and signed-off-by Andrew Morton.

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

1 files changed, 10 insertions, 23 deletions

diff --git a/drivers/net/wireless/atmel_cs.c b/drivers/net/wireless/atmel_cs.c
index 53fdaa22226d..522bbed47a05 100644
--- a/drivers/net/wireless/atmel_cs.c
+++ b/drivers/net/wireless/atmel_cs.c
@@ -154,22 +154,14 @@ typedef struct local_info_t {
 
 static int atmel_attach(struct pcmcia_device *p_dev)
 {
-        dev_link_t *link;
         local_info_t *local;
 
         DEBUG(0, "atmel_attach()\n");
 
-        /* Initialize the dev_link_t structure */
-        link = kzalloc(sizeof(struct dev_link_t), GFP_KERNEL);
-        if (!link) {
-                printk(KERN_ERR "atmel_cs: no memory for new device\n");
-                return -ENOMEM;
-        }
-
         /* Interrupt setup */
-        link->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
-        link->irq.IRQInfo1 = IRQ_LEVEL_ID;
-        link->irq.Handler = NULL;
+        p_dev->irq.Attributes = IRQ_TYPE_EXCLUSIVE;
+        p_dev->irq.IRQInfo1 = IRQ_LEVEL_ID;
+        p_dev->irq.Handler = NULL;
 
         /*
           General socket configuration defaults can go here.  In this
@@ -178,23 +170,19 @@ static int atmel_attach(struct pcmcia_device *p_dev)
           and attributes of IO windows) are fixed by the nature of the
           device, and can be hard-wired here.
         */
-        link->conf.Attributes = 0;
-        link->conf.IntType = INT_MEMORY_AND_IO;
+        p_dev->conf.Attributes = 0;
+        p_dev->conf.IntType = INT_MEMORY_AND_IO;
 
         /* Allocate space for private device-specific data */
         local = kzalloc(sizeof(local_info_t), GFP_KERNEL);
         if (!local) {
                 printk(KERN_ERR "atmel_cs: no memory for new device\n");
-                kfree (link);
                 return -ENOMEM;
         }
-        link->priv = local;
-
-        link->handle = p_dev;
-        p_dev->instance = link;
+        p_dev->priv = local;
 
-        link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
-        atmel_config(link);
+        p_dev->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
+        atmel_config(p_dev);
 
         return 0;
 } /* atmel_attach */
@@ -218,7 +206,6 @@ static void atmel_detach(struct pcmcia_device *p_dev)
                 atmel_release(link);
 
         kfree(link->priv);
-        kfree(link);
 }
 
 /*======================================================================
@@ -387,11 +374,11 @@ static void atmel_config(dev_link_t *link)
         
         /*
           At this point, the dev_node_t structure(s) need to be
-          initialized and arranged in a linked list at link->dev.
+          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 = &dev->node;
+        link->dev_node = &dev->node;
                         
         link->state &= ~DEV_CONFIG_PENDING;
         return;