[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>

1 files changed, 17 insertions, 20 deletions

diff --git a/drivers/bluetooth/bluecard_cs.c b/drivers/bluetooth/bluecard_cs.c
index b461411eab3e..e557f2359ccc 100644
--- a/drivers/bluetooth/bluecard_cs.c
+++ b/drivers/bluetooth/bluecard_cs.c
@@ -85,8 +85,8 @@ typedef struct bluecard_info_t {
 } bluecard_info_t;
 
 
-static void bluecard_config(dev_link_t *link);
-static void bluecard_release(dev_link_t *link);
+static void bluecard_config(struct pcmcia_device *link);
+static void bluecard_release(struct pcmcia_device *link);
 
 static void bluecard_detach(struct pcmcia_device *p_dev);
 
@@ -856,17 +856,16 @@ static int bluecard_close(bluecard_info_t *info)
         return 0;
 }
 
-static int bluecard_attach(struct pcmcia_device *p_dev)
+static int bluecard_attach(struct pcmcia_device *link)
 {
         bluecard_info_t *info;
-        dev_link_t *link = dev_to_instance(p_dev);
 
         /* Create new info device */
         info = kzalloc(sizeof(*info), GFP_KERNEL);
         if (!info)
                 return -ENOMEM;
 
-        info->p_dev = p_dev;
+        info->p_dev = link;
         link->priv = info;
 
         link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
@@ -887,9 +886,8 @@ static int bluecard_attach(struct pcmcia_device *p_dev)
 }
 
 
-static void bluecard_detach(struct pcmcia_device *p_dev)
+static void bluecard_detach(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         bluecard_info_t *info = link->priv;
 
         if (link->state & DEV_CONFIG)
@@ -899,7 +897,7 @@ static void bluecard_detach(struct pcmcia_device *p_dev)
 }
 
 
-static int first_tuple(client_handle_t handle, tuple_t *tuple, cisparse_t *parse)
+static int first_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse)
 {
         int i;
 
@@ -914,9 +912,8 @@ static int first_tuple(client_handle_t handle, tuple_t *tuple, cisparse_t *parse
         return pcmcia_parse_tuple(handle, tuple, parse);
 }
 
-static void bluecard_config(dev_link_t *link)
+static void bluecard_config(struct pcmcia_device *link)
 {
-        client_handle_t handle = link->handle;
         bluecard_info_t *info = link->priv;
         tuple_t tuple;
         u_short buf[256];
@@ -930,7 +927,7 @@ static void bluecard_config(dev_link_t *link)
 
         /* Get configuration register information */
         tuple.DesiredTuple = CISTPL_CONFIG;
-        last_ret = first_tuple(handle, &tuple, &parse);
+        last_ret = first_tuple(link, &tuple, &parse);
         if (last_ret != CS_SUCCESS) {
                 last_fn = ParseTuple;
                 goto cs_failed;
@@ -947,25 +944,25 @@ static void bluecard_config(dev_link_t *link)
 
         for (n = 0; n < 0x400; n += 0x40) {
                 link->io.BasePort1 = n ^ 0x300;
-                i = pcmcia_request_io(link->handle, &link->io);
+                i = pcmcia_request_io(link, &link->io);
                 if (i == CS_SUCCESS)
                         break;
         }
 
         if (i != CS_SUCCESS) {
-                cs_error(link->handle, RequestIO, i);
+                cs_error(link, RequestIO, i);
                 goto failed;
         }
 
-        i = pcmcia_request_irq(link->handle, &link->irq);
+        i = pcmcia_request_irq(link, &link->irq);
         if (i != CS_SUCCESS) {
-                cs_error(link->handle, RequestIRQ, i);
+                cs_error(link, RequestIRQ, i);
                 link->irq.AssignedIRQ = 0;
         }
 
-        i = pcmcia_request_configuration(link->handle, &link->conf);
+        i = pcmcia_request_configuration(link, &link->conf);
         if (i != CS_SUCCESS) {
-                cs_error(link->handle, RequestConfiguration, i);
+                cs_error(link, RequestConfiguration, i);
                 goto failed;
         }
 
@@ -979,14 +976,14 @@ static void bluecard_config(dev_link_t *link)
         return;
 
 cs_failed:
-        cs_error(link->handle, last_fn, last_ret);
+        cs_error(link, last_fn, last_ret);
 
 failed:
         bluecard_release(link);
 }
 
 
-static void bluecard_release(dev_link_t *link)
+static void bluecard_release(struct pcmcia_device *link)
 {
         bluecard_info_t *info = link->priv;
 
@@ -995,7 +992,7 @@ static void bluecard_release(dev_link_t *link)
 
         del_timer(&(info->timer));
 
-        pcmcia_disable_device(link->handle);
+        pcmcia_disable_device(link);
 }
 
 static struct pcmcia_device_id bluecard_ids[] = {