[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, 8 insertions, 11 deletions

diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 488448a12b2f..4ab956843d86 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -391,6 +391,7 @@ static int pcmcia_device_probe(struct device * dev)
         }
 
         p_dev->p_state &= ~CLIENT_UNBOUND;
+        p_dev->handle = p_dev;
 
         ret = p_drv->probe(p_dev);
         if (ret)
@@ -1039,12 +1040,10 @@ static int pcmcia_dev_suspend(struct device * dev, pm_message_t state)
                 ret = p_drv->suspend(p_dev);
                 if (ret)
                         return ret;
-                if (p_dev->instance) {
-                        p_dev->instance->state |= DEV_SUSPEND;
-                        if ((p_dev->instance->state & DEV_CONFIG) &&
-                            !(p_dev->instance->state & DEV_SUSPEND_NORELEASE))
+                p_dev->state |= DEV_SUSPEND;
+                        if ((p_dev->state & DEV_CONFIG) &&
+                            !(p_dev->state & DEV_SUSPEND_NORELEASE))
                                 pcmcia_release_configuration(p_dev);
-                }
         }
 
         return 0;
@@ -1061,16 +1060,14 @@ static int pcmcia_dev_resume(struct device * dev)
                 p_drv = to_pcmcia_drv(dev->driver);
 
         if (p_drv && p_drv->resume) {
-                if (p_dev->instance) {
-                        p_dev->instance->state &= ~DEV_SUSPEND;
-                        if ((p_dev->instance->state & DEV_CONFIG) &&
-                            !(p_dev->instance->state & DEV_SUSPEND_NORELEASE)){
+                p_dev->state &= ~DEV_SUSPEND;
+                        if ((p_dev->state & DEV_CONFIG) &&
+                            !(p_dev->state & DEV_SUSPEND_NORELEASE)){
                                 ret = pcmcia_request_configuration(p_dev,
-                                                 &p_dev->instance->conf);
+                                                 &p_dev->conf);
                                 if (ret)
                                         return ret;
                         }
-                }
                 return p_drv->resume(p_dev);
         }