[PATCH] pcmcia: remove dev_link_t and client_handle_t indirection

dev_link_t * and client_handle_t both mean struct pcmcai_device * by now.
Therefore, remove all such indirections.

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

6 files changed, 111 insertions, 139 deletions

diff --git a/drivers/scsi/pcmcia/aha152x_stub.c b/drivers/scsi/pcmcia/aha152x_stub.c
index 0c196fbb3121..21c6b1014535 100644
--- a/drivers/scsi/pcmcia/aha152x_stub.c
+++ b/drivers/scsi/pcmcia/aha152x_stub.c
@@ -94,24 +94,23 @@ typedef struct scsi_info_t {
     struct Scsi_Host    *host;
 } scsi_info_t;
 
-static void aha152x_release_cs(dev_link_t *link);
+static void aha152x_release_cs(struct pcmcia_device *link);
 static void aha152x_detach(struct pcmcia_device *p_dev);
-static void aha152x_config_cs(dev_link_t *link);
+static void aha152x_config_cs(struct pcmcia_device *link);
 
-static dev_link_t *dev_list;
+static struct pcmcia_device *dev_list;
 
-static int aha152x_attach(struct pcmcia_device *p_dev)
+static int aha152x_attach(struct pcmcia_device *link)
 {
     scsi_info_t *info;
-    dev_link_t *link = dev_to_instance(p_dev);
-    
+
     DEBUG(0, "aha152x_attach()\n");
 
     /* Create new SCSI device */
     info = kmalloc(sizeof(*info), GFP_KERNEL);
     if (!info) return -ENOMEM;
     memset(info, 0, sizeof(*info));
-    info->p_dev = p_dev;
+    info->p_dev = link;
     link->priv = info;
 
     link->io.NumPorts1 = 0x20;
@@ -131,10 +130,8 @@ static int aha152x_attach(struct pcmcia_device *p_dev)
 
 /*====================================================================*/
 
-static void aha152x_detach(struct pcmcia_device *p_dev)
+static void aha152x_detach(struct pcmcia_device *link)
 {
-    dev_link_t *link = dev_to_instance(p_dev);
-
     DEBUG(0, "aha152x_detach(0x%p)\n", link);
 
     if (link->state & DEV_CONFIG)
@@ -149,9 +146,8 @@ static void aha152x_detach(struct pcmcia_device *p_dev)
 #define CS_CHECK(fn, ret) \
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 
-static void aha152x_config_cs(dev_link_t *link)
+static void aha152x_config_cs(struct pcmcia_device *link)
 {
-    client_handle_t handle = link->handle;
     scsi_info_t *info = link->priv;
     struct aha152x_setup s;
     tuple_t tuple;
@@ -166,19 +162,19 @@ static void aha152x_config_cs(dev_link_t *link)
     tuple.TupleData = tuple_data;
     tuple.TupleDataMax = 64;
     tuple.TupleOffset = 0;
-    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
-    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
-    CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
+    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;
 
     tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
     while (1) {
-        if (pcmcia_get_tuple_data(handle, &tuple) != 0 ||
-                pcmcia_parse_tuple(handle, &tuple, &parse) != 0)
+        if (pcmcia_get_tuple_data(link, &tuple) != 0 ||
+                pcmcia_parse_tuple(link, &tuple, &parse) != 0)
             goto next_entry;
         /* For New Media T&J, look for a SCSI window */
         if (parse.cftable_entry.io.win[0].len >= 0x20)
@@ -189,15 +185,15 @@ static void aha152x_config_cs(dev_link_t *link)
         if ((parse.cftable_entry.io.nwin > 0) &&
             (link->io.BasePort1 < 0xffff)) {
             link->conf.ConfigIndex = parse.cftable_entry.index;
-            i = pcmcia_request_io(handle, &link->io);
+            i = pcmcia_request_io(link, &link->io);
             if (i == CS_SUCCESS) break;
         }
     next_entry:
-        CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(handle, &tuple));
+        CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &tuple));
     }
     
-    CS_CHECK(RequestIRQ, pcmcia_request_irq(handle, &link->irq));
-    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(handle, &link->conf));
+    CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
+    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
     
     /* Set configuration options for the aha152x driver */
     memset(&s, 0, sizeof(s));
@@ -226,22 +222,21 @@ static void aha152x_config_cs(dev_link_t *link)
     return;
     
 cs_failed:
-    cs_error(link->handle, last_fn, last_ret);
+    cs_error(link, last_fn, last_ret);
     aha152x_release_cs(link);
     return;
 }
 
-static void aha152x_release_cs(dev_link_t *link)
+static void aha152x_release_cs(struct pcmcia_device *link)
 {
         scsi_info_t *info = link->priv;
 
         aha152x_release(info->host);
-        pcmcia_disable_device(link->handle);
+        pcmcia_disable_device(link);
 }
 
-static int aha152x_resume(struct pcmcia_device *dev)
+static int aha152x_resume(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(dev);
         scsi_info_t *info = link->priv;
 
         aha152x_host_reset_host(info->host);
diff --git a/drivers/scsi/pcmcia/fdomain_stub.c b/drivers/scsi/pcmcia/fdomain_stub.c
index 94dcee9f285a..4e6927112c05 100644
--- a/drivers/scsi/pcmcia/fdomain_stub.c
+++ b/drivers/scsi/pcmcia/fdomain_stub.c
@@ -79,14 +79,13 @@ typedef struct scsi_info_t {
 } scsi_info_t;
 
 
-static void fdomain_release(dev_link_t *link);
+static void fdomain_release(struct pcmcia_device *link);
 static void fdomain_detach(struct pcmcia_device *p_dev);
-static void fdomain_config(dev_link_t *link);
+static void fdomain_config(struct pcmcia_device *link);
 
-static int fdomain_attach(struct pcmcia_device *p_dev)
+static int fdomain_attach(struct pcmcia_device *link)
 {
     scsi_info_t *info;
-    dev_link_t *link = dev_to_instance(p_dev);
 
     DEBUG(0, "fdomain_attach()\n");
 
@@ -94,7 +93,7 @@ static int fdomain_attach(struct pcmcia_device *p_dev)
     info = kmalloc(sizeof(*info), GFP_KERNEL);
     if (!info) return -ENOMEM;
     memset(info, 0, sizeof(*info));
-    info->p_dev = p_dev;
+    info->p_dev = link;
     link->priv = info;
     link->io.NumPorts1 = 0x10;
     link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
@@ -113,10 +112,8 @@ static int fdomain_attach(struct pcmcia_device *p_dev)
 
 /*====================================================================*/
 
-static void fdomain_detach(struct pcmcia_device *p_dev)
+static void fdomain_detach(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
-
         DEBUG(0, "fdomain_detach(0x%p)\n", link);
 
         if (link->state & DEV_CONFIG)
@@ -130,9 +127,8 @@ static void fdomain_detach(struct pcmcia_device *p_dev)
 #define CS_CHECK(fn, ret) \
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 
-static void fdomain_config(dev_link_t *link)
+static void fdomain_config(struct pcmcia_device *link)
 {
-    client_handle_t handle = link->handle;
     scsi_info_t *info = link->priv;
     tuple_t tuple;
     cisparse_t parse;
@@ -147,30 +143,30 @@ static void fdomain_config(dev_link_t *link)
     tuple.TupleData = tuple_data;
     tuple.TupleDataMax = 64;
     tuple.TupleOffset = 0;
-    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
-    CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
-    CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
+    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;
     
     tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+    CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
     while (1) {
-        if (pcmcia_get_tuple_data(handle, &tuple) != 0 ||
-                pcmcia_parse_tuple(handle, &tuple, &parse) != 0)
+        if (pcmcia_get_tuple_data(link, &tuple) != 0 ||
+                pcmcia_parse_tuple(link, &tuple, &parse) != 0)
             goto next_entry;
         link->conf.ConfigIndex = parse.cftable_entry.index;
         link->io.BasePort1 = parse.cftable_entry.io.win[0].base;
-        i = pcmcia_request_io(handle, &link->io);
+        i = pcmcia_request_io(link, &link->io);
         if (i == CS_SUCCESS) break;
     next_entry:
-        CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(handle, &tuple));
+        CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &tuple));
     }
 
-    CS_CHECK(RequestIRQ, pcmcia_request_irq(handle, &link->irq));
-    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(handle, &link->conf));
+    CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
+    CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
     
     /* A bad hack... */
     release_region(link->io.BasePort1, link->io.NumPorts1);
@@ -196,7 +192,7 @@ static void fdomain_config(dev_link_t *link)
     return;
     
 cs_failed:
-    cs_error(link->handle, last_fn, last_ret);
+    cs_error(link, last_fn, last_ret);
     fdomain_release(link);
     return;
     
@@ -204,23 +200,21 @@ cs_failed:
 
 /*====================================================================*/
 
-static void fdomain_release(dev_link_t *link)
+static void fdomain_release(struct pcmcia_device *link)
 {
         scsi_info_t *info = link->priv;
 
         DEBUG(0, "fdomain_release(0x%p)\n", link);
 
         scsi_remove_host(info->host);
-        pcmcia_disable_device(link->handle);
+        pcmcia_disable_device(link);
         scsi_unregister(info->host);
 }
 
 /*====================================================================*/
 
-static int fdomain_resume(struct pcmcia_device *dev)
+static int fdomain_resume(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(dev);
-
         if (link->state & DEV_CONFIG)
                 fdomain_16x0_bus_reset(NULL);
 
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index 23548fbf4898..ce4d7d868d27 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -1593,11 +1593,10 @@ static int nsp_eh_host_reset(Scsi_Cmnd *SCpnt)
     configure the card at this point -- we wait until we receive a
     card insertion event.
 ======================================================================*/
-static int nsp_cs_attach(struct pcmcia_device *p_dev)
+static int nsp_cs_attach(struct pcmcia_device *link)
 {
         scsi_info_t  *info;
         nsp_hw_data  *data = &nsp_data_base;
-        dev_link_t *link = dev_to_instance(p_dev);
 
         nsp_dbg(NSP_DEBUG_INIT, "in");
 
@@ -1605,7 +1604,7 @@ static int nsp_cs_attach(struct pcmcia_device *p_dev)
         info = kmalloc(sizeof(*info), GFP_KERNEL);
         if (info == NULL) { return -ENOMEM; }
         memset(info, 0, sizeof(*info));
-        info->p_dev = p_dev;
+        info->p_dev = link;
         link->priv = info;
         data->ScsiInfo = info;
 
@@ -1644,10 +1643,8 @@ static int nsp_cs_attach(struct pcmcia_device *p_dev)
     structures are freed.  Otherwise, the structures will be freed
     when the device is released.
 ======================================================================*/
-static void nsp_cs_detach(struct pcmcia_device *p_dev)
+static void nsp_cs_detach(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
-
         nsp_dbg(NSP_DEBUG_INIT, "in, link=0x%p", link);
 
         if (link->state & DEV_CONFIG) {
@@ -1668,9 +1665,8 @@ static void nsp_cs_detach(struct pcmcia_device *p_dev)
 #define CS_CHECK(fn, ret) \
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 /*====================================================================*/
-static void nsp_cs_config(dev_link_t *link)
+static void nsp_cs_config(struct pcmcia_device *link)
 {
-        client_handle_t   handle = link->handle;
         scsi_info_t      *info   = link->priv;
         tuple_t           tuple;
         cisparse_t        parse;
@@ -1694,9 +1690,9 @@ static void nsp_cs_config(dev_link_t *link)
         tuple.TupleData       = tuple_data;
         tuple.TupleDataMax    = sizeof(tuple_data);
         tuple.TupleOffset     = 0;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
-        CS_CHECK(GetTupleData,  pcmcia_get_tuple_data(handle, &tuple));
-        CS_CHECK(ParseTuple,    pcmcia_parse_tuple(handle, &tuple, &parse));
+        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
+        CS_CHECK(GetTupleData,  pcmcia_get_tuple_data(link, &tuple));
+        CS_CHECK(ParseTuple,    pcmcia_parse_tuple(link, &tuple, &parse));
         link->conf.ConfigBase = parse.config.base;
         link->conf.Present    = parse.config.rmask[0];
 
@@ -1704,15 +1700,15 @@ static void nsp_cs_config(dev_link_t *link)
         link->state           |= DEV_CONFIG;
 
         /* Look up the current Vcc */
-        CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(handle, &conf));
+        CS_CHECK(GetConfigurationInfo, pcmcia_get_configuration_info(link, &conf));
 
         tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
         while (1) {
                 cistpl_cftable_entry_t *cfg = &(parse.cftable_entry);
 
-                if (pcmcia_get_tuple_data(handle, &tuple) != 0 ||
-                                pcmcia_parse_tuple(handle, &tuple, &parse) != 0)
+                if (pcmcia_get_tuple_data(link, &tuple) != 0 ||
+                                pcmcia_parse_tuple(link, &tuple, &parse) != 0)
                         goto next_entry;
 
                 if (cfg->flags & CISTPL_CFTABLE_DEFAULT) { dflt = *cfg; }
@@ -1768,7 +1764,7 @@ static void nsp_cs_config(dev_link_t *link)
                                 link->io.NumPorts2 = io->win[1].len;
                         }
                         /* This reserves IO space but doesn't actually enable it */
-                        if (pcmcia_request_io(link->handle, &link->io) != 0)
+                        if (pcmcia_request_io(link, &link->io) != 0)
                                 goto next_entry;
                 }
 
@@ -1783,7 +1779,7 @@ static void nsp_cs_config(dev_link_t *link)
                                 req.Size = 0x1000;
                         }
                         req.AccessSpeed = 0;
-                        if (pcmcia_request_window(&link->handle, &req, &link->win) != 0)
+                        if (pcmcia_request_window(&link, &req, &link->win) != 0)
                                 goto next_entry;
                         map.Page = 0; map.CardOffset = mem->win[0].card_addr;
                         if (pcmcia_map_mem_page(link->win, &map) != 0)
@@ -1797,14 +1793,14 @@ static void nsp_cs_config(dev_link_t *link)
 
         next_entry:
                 nsp_dbg(NSP_DEBUG_INIT, "next");
-                pcmcia_disable_device(handle);
-                CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(handle, &tuple));
+                pcmcia_disable_device(link);
+                CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &tuple));
         }
 
         if (link->conf.Attributes & CONF_ENABLE_IRQ) {
-                CS_CHECK(RequestIRQ, pcmcia_request_irq(link->handle, &link->irq));
+                CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
         }
-        CS_CHECK(RequestConfiguration, pcmcia_request_configuration(handle, &link->conf));
+        CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
 
         if (free_ports) {
                 if (link->io.BasePort1) {
@@ -1925,7 +1921,7 @@ static void nsp_cs_config(dev_link_t *link)
 
  cs_failed:
         nsp_dbg(NSP_DEBUG_INIT, "config fail");
-        cs_error(link->handle, last_fn, last_ret);
+        cs_error(link, last_fn, last_ret);
         nsp_cs_release(link);
 
         return;
@@ -1938,7 +1934,7 @@ static void nsp_cs_config(dev_link_t *link)
     device, and release the PCMCIA configuration.  If the device is
     still open, this will be postponed until it is closed.
 ======================================================================*/
-static void nsp_cs_release(dev_link_t *link)
+static void nsp_cs_release(struct pcmcia_device *link)
 {
         scsi_info_t *info = link->priv;
         nsp_hw_data *data = NULL;
@@ -1966,7 +1962,7 @@ static void nsp_cs_release(dev_link_t *link)
                         iounmap((void *)(data->MmioAddress));
                 }
         }
-        pcmcia_disable_device(link->handle);
+        pcmcia_disable_device(link);
 
 #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,2))
         if (info->host != NULL) {
@@ -1975,9 +1971,8 @@ static void nsp_cs_release(dev_link_t *link)
 #endif
 } /* nsp_cs_release */
 
-static int nsp_cs_suspend(struct pcmcia_device *dev)
+static int nsp_cs_suspend(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(dev);
         scsi_info_t *info = link->priv;
         nsp_hw_data *data;
 
@@ -1996,9 +1991,8 @@ static int nsp_cs_suspend(struct pcmcia_device *dev)
         return 0;
 }
 
-static int nsp_cs_resume(struct pcmcia_device *dev)
+static int nsp_cs_resume(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(dev);
         scsi_info_t *info = link->priv;
         nsp_hw_data *data;
 
diff --git a/drivers/scsi/pcmcia/nsp_cs.h b/drivers/scsi/pcmcia/nsp_cs.h
index 2e1fde467c27..ce348b379f22 100644
--- a/drivers/scsi/pcmcia/nsp_cs.h
+++ b/drivers/scsi/pcmcia/nsp_cs.h
@@ -297,8 +297,8 @@ typedef struct _nsp_hw_data {
 
 /* Card service functions */
 static void        nsp_cs_detach (struct pcmcia_device *p_dev);
-static void        nsp_cs_release(dev_link_t *link);
-static void        nsp_cs_config (dev_link_t *link);
+static void        nsp_cs_release(struct pcmcia_device *link);
+static void        nsp_cs_config (struct pcmcia_device *link);
 
 /* Linux SCSI subsystem specific functions */
 static struct Scsi_Host *nsp_detect     (struct scsi_host_template *sht);
@@ -450,7 +450,7 @@ static inline struct Scsi_Host *scsi_host_hn_get(unsigned short hostno)
         return host;
 }
 
-static void cs_error(client_handle_t handle, int func, int ret)
+static void cs_error(struct pcmcia_device *handle, int func, int ret)
 {
         error_info_t err = { func, ret };
         pcmcia_report_error(handle, &err);
diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c
index c6b3e9587ff3..a2a1c4b318e6 100644
--- a/drivers/scsi/pcmcia/qlogic_stub.c
+++ b/drivers/scsi/pcmcia/qlogic_stub.c
@@ -97,12 +97,12 @@ typedef struct scsi_info_t {
         unsigned short manf_id;
 } scsi_info_t;
 
-static void qlogic_release(dev_link_t *link);
+static void qlogic_release(struct pcmcia_device *link);
 static void qlogic_detach(struct pcmcia_device *p_dev);
-static void qlogic_config(dev_link_t * link);
+static void qlogic_config(struct pcmcia_device * link);
 
 static struct Scsi_Host *qlogic_detect(struct scsi_host_template *host,
-                                dev_link_t *link, int qbase, int qlirq)
+                                struct pcmcia_device *link, int qbase, int qlirq)
 {
         int qltyp;              /* type of chip */
         int qinitid;
@@ -156,10 +156,9 @@ free_scsi_host:
 err:
         return NULL;
 }
-static int qlogic_attach(struct pcmcia_device *p_dev)
+static int qlogic_attach(struct pcmcia_device *link)
 {
         scsi_info_t *info;
-        dev_link_t *link = dev_to_instance(p_dev);
 
         DEBUG(0, "qlogic_attach()\n");
 
@@ -168,7 +167,7 @@ static int qlogic_attach(struct pcmcia_device *p_dev)
         if (!info)
                 return -ENOMEM;
         memset(info, 0, sizeof(*info));
-        info->p_dev = p_dev;
+        info->p_dev = link;
         link->priv = info;
         link->io.NumPorts1 = 16;
         link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;
@@ -187,10 +186,8 @@ static int qlogic_attach(struct pcmcia_device *p_dev)
 
 /*====================================================================*/
 
-static void qlogic_detach(struct pcmcia_device *p_dev)
+static void qlogic_detach(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
-
         DEBUG(0, "qlogic_detach(0x%p)\n", link);
 
         if (link->state & DEV_CONFIG)
@@ -205,9 +202,8 @@ static void qlogic_detach(struct pcmcia_device *p_dev)
 #define CS_CHECK(fn, ret) \
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 
-static void qlogic_config(dev_link_t * link)
+static void qlogic_config(struct pcmcia_device * link)
 {
-        client_handle_t handle = link->handle;
         scsi_info_t *info = link->priv;
         tuple_t tuple;
         cisparse_t parse;
@@ -221,38 +217,38 @@ static void qlogic_config(dev_link_t * link)
         tuple.TupleDataMax = 64;
         tuple.TupleOffset = 0;
         tuple.DesiredTuple = CISTPL_CONFIG;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
-        CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
-        CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
+        CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
+        CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
         link->conf.ConfigBase = parse.config.base;
 
         tuple.DesiredTuple = CISTPL_MANFID;
-        if ((pcmcia_get_first_tuple(handle, &tuple) == CS_SUCCESS) && (pcmcia_get_tuple_data(handle, &tuple) == CS_SUCCESS))
+        if ((pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS) && (pcmcia_get_tuple_data(link, &tuple) == CS_SUCCESS))
                 info->manf_id = le16_to_cpu(tuple.TupleData[0]);
 
         /* Configure card */
         link->state |= DEV_CONFIG;
 
         tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
         while (1) {
-                if (pcmcia_get_tuple_data(handle, &tuple) != 0 ||
-                                pcmcia_parse_tuple(handle, &tuple, &parse) != 0)
+                if (pcmcia_get_tuple_data(link, &tuple) != 0 ||
+                                pcmcia_parse_tuple(link, &tuple, &parse) != 0)
                         goto next_entry;
                 link->conf.ConfigIndex = parse.cftable_entry.index;
                 link->io.BasePort1 = parse.cftable_entry.io.win[0].base;
                 link->io.NumPorts1 = parse.cftable_entry.io.win[0].len;
                 if (link->io.BasePort1 != 0) {
-                        i = pcmcia_request_io(handle, &link->io);
+                        i = pcmcia_request_io(link, &link->io);
                         if (i == CS_SUCCESS)
                                 break;
                 }
               next_entry:
-                CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(handle, &tuple));
+                CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &tuple));
         }
 
-        CS_CHECK(RequestIRQ, pcmcia_request_irq(handle, &link->irq));
-        CS_CHECK(RequestConfiguration, pcmcia_request_configuration(handle, &link->conf));
+        CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
+        CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
 
         if ((info->manf_id == MANFID_MACNICA) || (info->manf_id == MANFID_PIONEER) || (info->manf_id == 0x0098)) {
                 /* set ATAcmd */
@@ -283,15 +279,15 @@ out:
         return;
 
 cs_failed:
-        cs_error(link->handle, last_fn, last_ret);
-        pcmcia_disable_device(link->handle);
+        cs_error(link, last_fn, last_ret);
+        pcmcia_disable_device(link);
         return;
 
 }                               /* qlogic_config */
 
 /*====================================================================*/
 
-static void qlogic_release(dev_link_t *link)
+static void qlogic_release(struct pcmcia_device *link)
 {
         scsi_info_t *info = link->priv;
 
@@ -300,21 +296,19 @@ static void qlogic_release(dev_link_t *link)
         scsi_remove_host(info->host);
 
         free_irq(link->irq.AssignedIRQ, info->host);
-        pcmcia_disable_device(link->handle);
+        pcmcia_disable_device(link);
 
         scsi_host_put(info->host);
 }
 
 /*====================================================================*/
 
-static int qlogic_resume(struct pcmcia_device *dev)
+static int qlogic_resume(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(dev);
-
         if (link->state & DEV_CONFIG) {
                 scsi_info_t *info = link->priv;
 
-                pcmcia_request_configuration(link->handle, &link->conf);
+                pcmcia_request_configuration(link, &link->conf);
                 if ((info->manf_id == MANFID_MACNICA) ||
                     (info->manf_id == MANFID_PIONEER) ||
                     (info->manf_id == 0x0098)) {
diff --git a/drivers/scsi/pcmcia/sym53c500_cs.c b/drivers/scsi/pcmcia/sym53c500_cs.c
index 1ef3109418c9..49a37de68758 100644
--- a/drivers/scsi/pcmcia/sym53c500_cs.c
+++ b/drivers/scsi/pcmcia/sym53c500_cs.c
@@ -527,7 +527,7 @@ idle_out:
 }
 
 static void
-SYM53C500_release(dev_link_t *link)
+SYM53C500_release(struct pcmcia_device *link)
 {
         struct scsi_info_t *info = link->priv;
         struct Scsi_Host *shost = info->host;
@@ -550,7 +550,7 @@ SYM53C500_release(dev_link_t *link)
         if (shost->io_port && shost->n_io_port)
                 release_region(shost->io_port, shost->n_io_port);
 
-        pcmcia_disable_device(link->handle);
+        pcmcia_disable_device(link);
 
         scsi_host_put(shost);
 } /* SYM53C500_release */
@@ -708,9 +708,8 @@ static struct scsi_host_template sym53c500_driver_template = {
 do { last_fn = (fn); if ((last_ret = (ret)) != 0) goto cs_failed; } while (0)
 
 static void
-SYM53C500_config(dev_link_t *link)
+SYM53C500_config(struct pcmcia_device *link)
 {
-        client_handle_t handle = link->handle;
         struct scsi_info_t *info = link->priv;
         tuple_t tuple;
         cisparse_t parse;
@@ -727,40 +726,40 @@ SYM53C500_config(dev_link_t *link)
         tuple.TupleDataMax = 64;
         tuple.TupleOffset = 0;
         tuple.DesiredTuple = CISTPL_CONFIG;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
-        CS_CHECK(GetTupleData, pcmcia_get_tuple_data(handle, &tuple));
-        CS_CHECK(ParseTuple, pcmcia_parse_tuple(handle, &tuple, &parse));
+        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
+        CS_CHECK(GetTupleData, pcmcia_get_tuple_data(link, &tuple));
+        CS_CHECK(ParseTuple, pcmcia_parse_tuple(link, &tuple, &parse));
         link->conf.ConfigBase = parse.config.base;
 
         tuple.DesiredTuple = CISTPL_MANFID;
-        if ((pcmcia_get_first_tuple(handle, &tuple) == CS_SUCCESS) &&
-            (pcmcia_get_tuple_data(handle, &tuple) == CS_SUCCESS))
+        if ((pcmcia_get_first_tuple(link, &tuple) == CS_SUCCESS) &&
+            (pcmcia_get_tuple_data(link, &tuple) == CS_SUCCESS))
                 info->manf_id = le16_to_cpu(tuple.TupleData[0]);
 
         /* Configure card */
         link->state |= DEV_CONFIG;
 
         tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
-        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(handle, &tuple));
+        CS_CHECK(GetFirstTuple, pcmcia_get_first_tuple(link, &tuple));
         while (1) {
-                if (pcmcia_get_tuple_data(handle, &tuple) != 0 ||
-                    pcmcia_parse_tuple(handle, &tuple, &parse) != 0)
+                if (pcmcia_get_tuple_data(link, &tuple) != 0 ||
+                    pcmcia_parse_tuple(link, &tuple, &parse) != 0)
                         goto next_entry;
                 link->conf.ConfigIndex = parse.cftable_entry.index;
                 link->io.BasePort1 = parse.cftable_entry.io.win[0].base;
                 link->io.NumPorts1 = parse.cftable_entry.io.win[0].len;
 
                 if (link->io.BasePort1 != 0) {
-                        i = pcmcia_request_io(handle, &link->io);
+                        i = pcmcia_request_io(link, &link->io);
                         if (i == CS_SUCCESS)
                                 break;
                 }
 next_entry:
-                CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(handle, &tuple));
+                CS_CHECK(GetNextTuple, pcmcia_get_next_tuple(link, &tuple));
         }
 
-        CS_CHECK(RequestIRQ, pcmcia_request_irq(handle, &link->irq));
-        CS_CHECK(RequestConfiguration, pcmcia_request_configuration(handle, &link->conf));
+        CS_CHECK(RequestIRQ, pcmcia_request_irq(link, &link->irq));
+        CS_CHECK(RequestConfiguration, pcmcia_request_configuration(link, &link->conf));
 
         /*
         *  That's the trouble with copying liberally from another driver.
@@ -852,14 +851,13 @@ out:
         return;
 
 cs_failed:
-        cs_error(link->handle, last_fn, last_ret);
+        cs_error(link, last_fn, last_ret);
         SYM53C500_release(link);
         return;
 } /* SYM53C500_config */
 
-static int sym53c500_resume(struct pcmcia_device *dev)
+static int sym53c500_resume(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(dev);
         struct scsi_info_t *info = link->priv;
 
         if (link->state & DEV_CONFIG) {
@@ -882,10 +880,8 @@ static int sym53c500_resume(struct pcmcia_device *dev)
 }
 
 static void
-SYM53C500_detach(struct pcmcia_device *p_dev)
+SYM53C500_detach(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
-
         DEBUG(0, "SYM53C500_detach(0x%p)\n", link);
 
         if (link->state & DEV_CONFIG)
@@ -896,10 +892,9 @@ SYM53C500_detach(struct pcmcia_device *p_dev)
 } /* SYM53C500_detach */
 
 static int
-SYM53C500_attach(struct pcmcia_device *p_dev)
+SYM53C500_attach(struct pcmcia_device *link)
 {
         struct scsi_info_t *info;
-        dev_link_t *link = dev_to_instance(p_dev);
 
         DEBUG(0, "SYM53C500_attach()\n");
 
@@ -908,7 +903,7 @@ SYM53C500_attach(struct pcmcia_device *p_dev)
         if (!info)
                 return -ENOMEM;
         memset(info, 0, sizeof(*info));
-        info->p_dev = p_dev;
+        info->p_dev = link;
         link->priv = info;
         link->io.NumPorts1 = 16;
         link->io.Attributes1 = IO_DATA_PATH_WIDTH_AUTO;