[PATCH] pcmcia: unify attach, EVENT_CARD_INSERTION handlers into one probe callback

[linux-2.6] / drivers / usb / host / sl811_cs.c

diff --git a/drivers/usb/host/sl811_cs.c b/drivers/usb/host/sl811_cs.c
index ed3e7014dbbc19368d4ec5c5c8903232fd9deb84..466384d7c79fa7a9c2785af8361fcc3fe4100cf3 100644 (file)
--- a/drivers/usb/host/sl811_cs.c
+++ b/drivers/usb/host/sl811_cs.c
@@ -66,8 +66,6 @@ module_param(pc_debug, int, 0644);
 
 static const char driver_name[DEV_NAME_LEN]  = "sl811_cs";
 
-static dev_link_t *dev_list = NULL;
-
 typedef struct local_info_t {
        dev_link_t              link;
        dev_node_t              node;
@@ -143,24 +141,13 @@ static int sl811_hc_init(struct device *parent, ioaddr_t base_addr, int irq)
 static void sl811_cs_detach(struct pcmcia_device *p_dev)
 {
        dev_link_t *link = dev_to_instance(p_dev);
-       dev_link_t **linkp;
 
        DBG(0, "sl811_cs_detach(0x%p)\n", link);
 
-       /* Locate device structure */
-       for (linkp = &dev_list; *linkp; linkp = &(*linkp)->next) {
-               if (*linkp == link)
-                       break;
-       }
-       if (*linkp == NULL)
-               return;
-
        link->state &= ~DEV_PRESENT;
        if (link->state & DEV_CONFIG)
                sl811_cs_release(link);
 
-       /* Unlink device structure, and free it */
-       *linkp = link->next;
        /* This points to the parent local_info_t struct */
        kfree(link->priv);
 }
@@ -338,32 +325,14 @@ static int sl811_resume(struct pcmcia_device *dev)
        return 0;
 }
 
-static int
-sl811_cs_event(event_t event, int priority, event_callback_args_t *args)
-{
-       dev_link_t *link = args->client_data;
-
-       DBG(1, "sl811_cs_event(0x%06x)\n", event);
-
-       switch (event) {
-       case CS_EVENT_CARD_INSERTION:
-               link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
-               sl811_cs_config(link);
-               break;
-       }
-       return 0;
-}
-
-static dev_link_t *sl811_cs_attach(void)
+static int sl811_cs_attach(struct pcmcia_device *p_dev)
 {
        local_info_t *local;
        dev_link_t *link;
-       client_reg_t client_reg;
-       int ret;
 
        local = kmalloc(sizeof(local_info_t), GFP_KERNEL);
        if (!local)
-               return NULL;
+               return -ENOMEM;
        memset(local, 0, sizeof(local_info_t));
        link = &local->link;
        link->priv = local;
@@ -377,21 +346,13 @@ static dev_link_t *sl811_cs_attach(void)
        link->conf.Vcc = 33;
        link->conf.IntType = INT_MEMORY_AND_IO;
 
-       /* Register with Card Services */
-       link->next = dev_list;
-       dev_list = link;
-       client_reg.dev_info = (dev_info_t *) &driver_name;
-       client_reg.Attributes = INFO_IO_CLIENT | INFO_CARD_SHARE;
-       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);
-               sl811_cs_detach(link->handle);
-               return NULL;
-       }
+       link->handle = p_dev;
+       p_dev->instance = link;
+
+       link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
+       sl811_cs_config(link);
 
-       return link;
+       return 0;
 }
 
 static struct pcmcia_device_id sl811_ids[] = {
@@ -405,8 +366,7 @@ static struct pcmcia_driver sl811_cs_driver = {
        .drv            = {
                .name   = (char *)driver_name,
        },
-       .attach         = sl811_cs_attach,
-       .event          = sl811_cs_event,
+       .probe          = sl811_cs_attach,
        .remove         = sl811_cs_detach,
        .id_table       = sl811_ids,
        .suspend        = sl811_suspend,