Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

1 files changed, 32 insertions, 79 deletions

diff --git a/drivers/bluetooth/dtl1_cs.c b/drivers/bluetooth/dtl1_cs.c
index dec5980a1cd6..0449bc45ae5e 100644
--- a/drivers/bluetooth/dtl1_cs.c
+++ b/drivers/bluetooth/dtl1_cs.c
@@ -89,14 +89,8 @@ typedef struct dtl1_info_t {
 
 static void dtl1_config(dev_link_t *link);
 static void dtl1_release(dev_link_t *link);
-static int dtl1_event(event_t event, int priority, event_callback_args_t *args);
 
-static dev_info_t dev_info = "dtl1_cs";
-
-static dev_link_t *dtl1_attach(void);
-static void dtl1_detach(dev_link_t *);
-
-static dev_link_t *dev_list = NULL;
+static void dtl1_detach(struct pcmcia_device *p_dev);
 
 
 /* Transmit states  */
@@ -561,17 +555,15 @@ static int dtl1_close(dtl1_info_t *info)
         return 0;
 }
 
-static dev_link_t *dtl1_attach(void)
+static int dtl1_attach(struct pcmcia_device *p_dev)
 {
         dtl1_info_t *info;
-        client_reg_t client_reg;
         dev_link_t *link;
-        int ret;
 
         /* Create new info device */
         info = kzalloc(sizeof(*info), GFP_KERNEL);
         if (!info)
-                return NULL;
+                return -ENOMEM;
 
         link = &info->link;
         link->priv = info;
@@ -588,50 +580,24 @@ static dev_link_t *dtl1_attach(void)
         link->conf.Vcc = 50;
         link->conf.IntType = INT_MEMORY_AND_IO;
 
-        /* Register with Card Services */
-        link->next = dev_list;
-        dev_list = link;
-        client_reg.dev_info = &dev_info;
-        client_reg.Version = 0x0210;
-        client_reg.event_callback_args.client_data = link;
-
-        ret = pcmcia_register_client(&link->handle, &client_reg);
-        if (ret != CS_SUCCESS) {
-                cs_error(link->handle, RegisterClient, ret);
-                dtl1_detach(link);
-                return NULL;
-        }
+        link->handle = p_dev;
+        p_dev->instance = link;
 
-        return link;
+        link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
+        dtl1_config(link);
+
+        return 0;
 }
 
 
-static void dtl1_detach(dev_link_t *link)
+static void dtl1_detach(struct pcmcia_device *p_dev)
 {
+        dev_link_t *link = dev_to_instance(p_dev);
         dtl1_info_t *info = link->priv;
-        dev_link_t **linkp;
-        int ret;
-
-        /* Locate device structure */
-        for (linkp = &dev_list; *linkp; linkp = &(*linkp)->next)
-                if (*linkp == link)
-                        break;
-
-        if (*linkp == NULL)
-                return;
 
         if (link->state & DEV_CONFIG)
                 dtl1_release(link);
 
-        if (link->handle) {
-                ret = pcmcia_deregister_client(link->handle);
-                if (ret != CS_SUCCESS)
-                        cs_error(link->handle, DeregisterClient, ret);
-        }
-
-        /* Unlink device structure, free bits */
-        *linkp = link->next;
-
         kfree(info);
 }
 
@@ -763,46 +729,33 @@ static void dtl1_release(dev_link_t *link)
         link->state &= ~DEV_CONFIG;
 }
 
+static int dtl1_suspend(struct pcmcia_device *dev)
+{
+        dev_link_t *link = dev_to_instance(dev);
 
-static int dtl1_event(event_t event, int priority, event_callback_args_t *args)
+        link->state |= DEV_SUSPEND;
+        if (link->state & DEV_CONFIG)
+                pcmcia_release_configuration(link->handle);
+
+        return 0;
+}
+
+static int dtl1_resume(struct pcmcia_device *dev)
 {
-        dev_link_t *link = args->client_data;
-        dtl1_info_t *info = link->priv;
+        dev_link_t *link = dev_to_instance(dev);
 
-        switch (event) {
-        case CS_EVENT_CARD_REMOVAL:
-                link->state &= ~DEV_PRESENT;
-                if (link->state & DEV_CONFIG) {
-                        dtl1_close(info);
-                        dtl1_release(link);
-                }
-                break;
-        case CS_EVENT_CARD_INSERTION:
-                link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
-                dtl1_config(link);
-                break;
-        case CS_EVENT_PM_SUSPEND:
-                link->state |= DEV_SUSPEND;
-                /* Fall through... */
-        case CS_EVENT_RESET_PHYSICAL:
-                if (link->state & DEV_CONFIG)
-                        pcmcia_release_configuration(link->handle);
-                break;
-        case CS_EVENT_PM_RESUME:
-                link->state &= ~DEV_SUSPEND;
-                /* Fall through... */
-        case CS_EVENT_CARD_RESET:
-                if (DEV_OK(link))
-                        pcmcia_request_configuration(link->handle, &link->conf);
-                break;
-        }
+        link->state &= ~DEV_SUSPEND;
+        if (DEV_OK(link))
+                pcmcia_request_configuration(link->handle, &link->conf);
 
         return 0;
 }
 
+
 static struct pcmcia_device_id dtl1_ids[] = {
         PCMCIA_DEVICE_PROD_ID12("Nokia Mobile Phones", "DTL-1", 0xe1bfdd64, 0xe168480d),
         PCMCIA_DEVICE_PROD_ID12("Socket", "CF", 0xb38bcc2e, 0x44ebf863),
+        PCMCIA_DEVICE_PROD_ID12("Socket", "CF+ Personal Network Card", 0xb38bcc2e, 0xe732bae3),
         PCMCIA_DEVICE_NULL
 };
 MODULE_DEVICE_TABLE(pcmcia, dtl1_ids);
@@ -812,10 +765,11 @@ static struct pcmcia_driver dtl1_driver = {
         .drv            = {
                 .name   = "dtl1_cs",
         },
-        .attach         = dtl1_attach,
-        .event          = dtl1_event,
-        .detach         = dtl1_detach,
+        .probe          = dtl1_attach,
+        .remove         = dtl1_detach,
         .id_table       = dtl1_ids,
+        .suspend        = dtl1_suspend,
+        .resume         = dtl1_resume,
 };
 
 static int __init init_dtl1_cs(void)
@@ -827,7 +781,6 @@ static int __init init_dtl1_cs(void)
 static void __exit exit_dtl1_cs(void)
 {
         pcmcia_unregister_driver(&dtl1_driver);
-        BUG_ON(dev_list != NULL);
 }
 
 module_init(init_dtl1_cs);