1 files changed, 40 insertions, 90 deletions

diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c
index 7b4bff4cfa2d..9ce4c93467e5 100644
--- a/drivers/bluetooth/btuart_cs.c
+++ b/drivers/bluetooth/btuart_cs.c
@@ -68,7 +68,7 @@ MODULE_LICENSE("GPL");
 
 
 typedef struct btuart_info_t {
-        dev_link_t link;
+        struct pcmcia_device *p_dev;
         dev_node_t node;
 
         struct hci_dev *hdev;
@@ -84,8 +84,8 @@ typedef struct btuart_info_t {
 } btuart_info_t;
 
 
-static void btuart_config(dev_link_t *link);
-static void btuart_release(dev_link_t *link);
+static int btuart_config(struct pcmcia_device *link);
+static void btuart_release(struct pcmcia_device *link);
 
 static void btuart_detach(struct pcmcia_device *p_dev);
 
@@ -146,13 +146,13 @@ static void btuart_write_wakeup(btuart_info_t *info)
         }
 
         do {
-                register unsigned int iobase = info->link.io.BasePort1;
+                register unsigned int iobase = info->p_dev->io.BasePort1;
                 register struct sk_buff *skb;
                 register int len;
 
                 clear_bit(XMIT_WAKEUP, &(info->tx_state));
 
-                if (!(info->link.state & DEV_PRESENT))
+                if (!pcmcia_dev_present(info->p_dev))
                         return;
 
                 if (!(skb = skb_dequeue(&(info->txq))))
@@ -187,7 +187,7 @@ static void btuart_receive(btuart_info_t *info)
                 return;
         }
 
-        iobase = info->link.io.BasePort1;
+        iobase = info->p_dev->io.BasePort1;
 
         do {
                 info->hdev->stat.byte_rx++;
@@ -301,7 +301,7 @@ static irqreturn_t btuart_interrupt(int irq, void *dev_inst, struct pt_regs *reg
                 return IRQ_NONE;
         }
 
-        iobase = info->link.io.BasePort1;
+        iobase = info->p_dev->io.BasePort1;
 
         spin_lock(&(info->lock));
 
@@ -357,7 +357,7 @@ static void btuart_change_speed(btuart_info_t *info, unsigned int speed)
                 return;
         }
 
-        iobase = info->link.io.BasePort1;
+        iobase = info->p_dev->io.BasePort1;
 
         spin_lock_irqsave(&(info->lock), flags);
 
@@ -481,7 +481,7 @@ static int btuart_hci_ioctl(struct hci_dev *hdev, unsigned int cmd, unsigned lon
 static int btuart_open(btuart_info_t *info)
 {
         unsigned long flags;
-        unsigned int iobase = info->link.io.BasePort1;
+        unsigned int iobase = info->p_dev->io.BasePort1;
         struct hci_dev *hdev;
 
         spin_lock_init(&(info->lock));
@@ -550,7 +550,7 @@ static int btuart_open(btuart_info_t *info)
 static int btuart_close(btuart_info_t *info)
 {
         unsigned long flags;
-        unsigned int iobase = info->link.io.BasePort1;
+        unsigned int iobase = info->p_dev->io.BasePort1;
         struct hci_dev *hdev = info->hdev;
 
         if (!hdev)
@@ -576,17 +576,16 @@ static int btuart_close(btuart_info_t *info)
         return 0;
 }
 
-static int btuart_attach(struct pcmcia_device *p_dev)
+static int btuart_probe(struct pcmcia_device *link)
 {
         btuart_info_t *info;
-        dev_link_t *link;
 
         /* Create new info device */
         info = kzalloc(sizeof(*info), GFP_KERNEL);
         if (!info)
                 return -ENOMEM;
 
-        link = &info->link;
+        info->p_dev = link;
         link->priv = info;
 
         link->io.Attributes1 = IO_DATA_PATH_WIDTH_8;
@@ -598,31 +597,21 @@ static int btuart_attach(struct pcmcia_device *p_dev)
         link->irq.Instance = info;
 
         link->conf.Attributes = CONF_ENABLE_IRQ;
-        link->conf.Vcc = 50;
         link->conf.IntType = INT_MEMORY_AND_IO;
 
-        link->handle = p_dev;
-        p_dev->instance = link;
-
-        link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
-        btuart_config(link);
-
-        return 0;
+        return btuart_config(link);
 }
 
 
-static void btuart_detach(struct pcmcia_device *p_dev)
+static void btuart_detach(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         btuart_info_t *info = link->priv;
 
-        if (link->state & DEV_CONFIG)
-                btuart_release(link);
-
+        btuart_release(link);
         kfree(info);
 }
 
-static int get_tuple(client_handle_t handle, tuple_t *tuple, cisparse_t *parse)
+static int get_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse)
 {
         int i;
 
@@ -633,30 +622,28 @@ static int get_tuple(client_handle_t handle, tuple_t *tuple, cisparse_t *parse)
         return pcmcia_parse_tuple(handle, tuple, parse);
 }
 
-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)
 {
         if (pcmcia_get_first_tuple(handle, tuple) != CS_SUCCESS)
                 return CS_NO_MORE_ITEMS;
         return get_tuple(handle, tuple, parse);
 }
 
-static int next_tuple(client_handle_t handle, tuple_t *tuple, cisparse_t *parse)
+static int next_tuple(struct pcmcia_device *handle, tuple_t *tuple, cisparse_t *parse)
 {
         if (pcmcia_get_next_tuple(handle, tuple) != CS_SUCCESS)
                 return CS_NO_MORE_ITEMS;
         return get_tuple(handle, tuple, parse);
 }
 
-static void btuart_config(dev_link_t *link)
+static int btuart_config(struct pcmcia_device *link)
 {
         static kio_addr_t base[5] = { 0x3f8, 0x2f8, 0x3e8, 0x2e8, 0x0 };
-        client_handle_t handle = link->handle;
         btuart_info_t *info = link->priv;
         tuple_t tuple;
         u_short buf[256];
         cisparse_t parse;
         cistpl_cftable_entry_t *cf = &parse.cftable_entry;
-        config_info_t config;
         int i, j, try, last_ret, last_fn;
 
         tuple.TupleData = (cisdata_t *)buf;
@@ -666,7 +653,7 @@ static void btuart_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;
@@ -674,11 +661,6 @@ static void btuart_config(dev_link_t *link)
         link->conf.ConfigBase = parse.config.base;
         link->conf.Present = parse.config.rmask[0];
 
-        /* Configure card */
-        link->state |= DEV_CONFIG;
-        i = pcmcia_get_configuration_info(handle, &config);
-        link->conf.Vcc = config.Vcc;
-
         /* First pass: look for a config entry that looks normal. */
         tuple.TupleData = (cisdata_t *) buf;
         tuple.TupleOffset = 0;
@@ -687,29 +669,29 @@ static void btuart_config(dev_link_t *link)
         tuple.DesiredTuple = CISTPL_CFTABLE_ENTRY;
         /* Two tries: without IO aliases, then with aliases */
         for (try = 0; try < 2; try++) {
-                i = first_tuple(handle, &tuple, &parse);
+                i = first_tuple(link, &tuple, &parse);
                 while (i != CS_NO_MORE_ITEMS) {
                         if (i != CS_SUCCESS)
                                 goto next_entry;
                         if (cf->vpp1.present & (1 << CISTPL_POWER_VNOM))
-                                link->conf.Vpp1 = link->conf.Vpp2 = cf->vpp1.param[CISTPL_POWER_VNOM] / 10000;
+                                link->conf.Vpp = cf->vpp1.param[CISTPL_POWER_VNOM] / 10000;
                         if ((cf->io.nwin > 0) && (cf->io.win[0].len == 8) && (cf->io.win[0].base != 0)) {
                                 link->conf.ConfigIndex = cf->index;
                                 link->io.BasePort1 = cf->io.win[0].base;
                                 link->io.IOAddrLines = (try == 0) ? 16 : cf->io.flags & CISTPL_IO_LINES_MASK;
-                                i = pcmcia_request_io(link->handle, &link->io);
+                                i = pcmcia_request_io(link, &link->io);
                                 if (i == CS_SUCCESS)
                                         goto found_port;
                         }
 next_entry:
-                        i = next_tuple(handle, &tuple, &parse);
+                        i = next_tuple(link, &tuple, &parse);
                 }
         }
 
         /* Second pass: try to find an entry that isn't picky about
            its base address, then try to grab any standard serial port
            address, and finally try to get any free port. */
-        i = first_tuple(handle, &tuple, &parse);
+        i = first_tuple(link, &tuple, &parse);
         while (i != CS_NO_MORE_ITEMS) {
                 if ((i == CS_SUCCESS) && (cf->io.nwin > 0)
                     && ((cf->io.flags & CISTPL_IO_LINES_MASK) <= 3)) {
@@ -717,30 +699,30 @@ next_entry:
                         for (j = 0; j < 5; j++) {
                                 link->io.BasePort1 = base[j];
                                 link->io.IOAddrLines = base[j] ? 16 : 3;
-                                i = pcmcia_request_io(link->handle, &link->io);
+                                i = pcmcia_request_io(link, &link->io);
                                 if (i == CS_SUCCESS)
                                         goto found_port;
                         }
                 }
-                i = next_tuple(handle, &tuple, &parse);
+                i = next_tuple(link, &tuple, &parse);
         }
 
 found_port:
         if (i != CS_SUCCESS) {
                 BT_ERR("No usable port range found");
-                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;
         }
 
@@ -748,58 +730,28 @@ found_port:
                 goto failed;
 
         strcpy(info->node.dev_name, info->hdev->name);
-        link->dev = &info->node;
-        link->state &= ~DEV_CONFIG_PENDING;
+        link->dev_node = &info->node;
 
-        return;
+        return 0;
 
 cs_failed:
-        cs_error(link->handle, last_fn, last_ret);
+        cs_error(link, last_fn, last_ret);
 
 failed:
         btuart_release(link);
+        return -ENODEV;
 }
 
 
-static void btuart_release(dev_link_t *link)
+static void btuart_release(struct pcmcia_device *link)
 {
         btuart_info_t *info = link->priv;
 
-        if (link->state & DEV_PRESENT)
-                btuart_close(info);
-
-        link->dev = NULL;
-
-        pcmcia_release_configuration(link->handle);
-        pcmcia_release_io(link->handle, &link->io);
-        pcmcia_release_irq(link->handle, &link->irq);
-
-        link->state &= ~DEV_CONFIG;
-}
-
-static int btuart_suspend(struct pcmcia_device *dev)
-{
-        dev_link_t *link = dev_to_instance(dev);
-
-        link->state |= DEV_SUSPEND;
-        if (link->state & DEV_CONFIG)
-                pcmcia_release_configuration(link->handle);
+        btuart_close(info);
 
-        return 0;
+        pcmcia_disable_device(link);
 }
 
-static int btuart_resume(struct pcmcia_device *dev)
-{
-        dev_link_t *link = dev_to_instance(dev);
-
-        link->state &= ~DEV_SUSPEND;
-        if (DEV_OK(link))
-                pcmcia_request_configuration(link->handle, &link->conf);
-
-        return 0;
-}
-
-
 static struct pcmcia_device_id btuart_ids[] = {
         /* don't use this driver. Use serial_cs + hci_uart instead */
         PCMCIA_DEVICE_NULL
@@ -811,11 +763,9 @@ static struct pcmcia_driver btuart_driver = {
         .drv            = {
                 .name   = "btuart_cs",
         },
-        .probe          = btuart_attach,
+        .probe          = btuart_probe,
         .remove         = btuart_detach,
         .id_table       = btuart_ids,
-        .suspend        = btuart_suspend,
-        .resume         = btuart_resume,
 };
 
 static int __init init_btuart_cs(void)