[PATCH] pcmcia: unify detach, REMOVAL_EVENT handlers into one remove callback

Unify the "detach" and REMOVAL_EVENT handlers to one "remove" function.
Old functionality is preserved, for the moment.

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

6 files changed, 26 insertions, 65 deletions

diff --git a/drivers/scsi/pcmcia/aha152x_stub.c b/drivers/scsi/pcmcia/aha152x_stub.c
index 82988a3e35ec..3128ba8c57a9 100644
--- a/drivers/scsi/pcmcia/aha152x_stub.c
+++ b/drivers/scsi/pcmcia/aha152x_stub.c
@@ -99,7 +99,7 @@ static int aha152x_event(event_t event, int priority,
                          event_callback_args_t *args);
 
 static dev_link_t *aha152x_attach(void);
-static void aha152x_detach(dev_link_t *);
+static void aha152x_detach(struct pcmcia_device *p_dev);
 
 static dev_link_t *dev_list;
 static dev_info_t dev_info = "aha152x_cs";
@@ -138,7 +138,7 @@ static dev_link_t *aha152x_attach(void)
     ret = pcmcia_register_client(&link->handle, &client_reg);
     if (ret != 0) {
         cs_error(link->handle, RegisterClient, ret);
-        aha152x_detach(link);
+        aha152x_detach(link->handle);
         return NULL;
     }
     
@@ -147,8 +147,9 @@ static dev_link_t *aha152x_attach(void)
 
 /*====================================================================*/
 
-static void aha152x_detach(dev_link_t *link)
+static void aha152x_detach(struct pcmcia_device *p_dev)
 {
+    dev_link_t *link = dev_to_instance(p_dev);
     dev_link_t **linkp;
 
     DEBUG(0, "aha152x_detach(0x%p)\n", link);
@@ -162,9 +163,6 @@ static void aha152x_detach(dev_link_t *link)
     if (link->state & DEV_CONFIG)
         aha152x_release_cs(link);
 
-    if (link->handle)
-        pcmcia_deregister_client(link->handle);
-    
     /* Unlink device structure, free bits */
     *linkp = link->next;
     kfree(link->priv);
@@ -307,11 +305,6 @@ static int aha152x_event(event_t event, int priority,
     DEBUG(0, "aha152x_event(0x%06x)\n", event);
     
     switch (event) {
-    case CS_EVENT_CARD_REMOVAL:
-        link->state &= ~DEV_PRESENT;
-        if (link->state & DEV_CONFIG)
-            aha152x_release_cs(link);
-        break;
     case CS_EVENT_CARD_INSERTION:
         link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
         aha152x_config_cs(link);
@@ -337,7 +330,7 @@ static struct pcmcia_driver aha152x_cs_driver = {
         },
         .attach         = aha152x_attach,
         .event          = aha152x_event,
-        .detach         = aha152x_detach,
+        .remove         = aha152x_detach,
         .id_table       = aha152x_ids,
         .suspend        = aha152x_suspend,
         .resume         = aha152x_resume,
diff --git a/drivers/scsi/pcmcia/fdomain_stub.c b/drivers/scsi/pcmcia/fdomain_stub.c
index 9e1d68c14694..5842c938fff5 100644
--- a/drivers/scsi/pcmcia/fdomain_stub.c
+++ b/drivers/scsi/pcmcia/fdomain_stub.c
@@ -84,7 +84,7 @@ static int fdomain_event(event_t event, int priority,
                         event_callback_args_t *args);
 
 static dev_link_t *fdomain_attach(void);
-static void fdomain_detach(dev_link_t *);
+static void fdomain_detach(struct pcmcia_device *p_dev);
 
 
 static dev_link_t *dev_list = NULL;
@@ -124,7 +124,7 @@ static dev_link_t *fdomain_attach(void)
     ret = pcmcia_register_client(&link->handle, &client_reg);
     if (ret != 0) {
         cs_error(link->handle, RegisterClient, ret);
-        fdomain_detach(link);
+        fdomain_detach(link->handle);
         return NULL;
     }
     
@@ -133,8 +133,9 @@ static dev_link_t *fdomain_attach(void)
 
 /*====================================================================*/
 
-static void fdomain_detach(dev_link_t *link)
+static void fdomain_detach(struct pcmcia_device *p_dev)
 {
+    dev_link_t *link = dev_to_instance(p_dev);
     dev_link_t **linkp;
 
     DEBUG(0, "fdomain_detach(0x%p)\n", link);
@@ -148,9 +149,6 @@ static void fdomain_detach(dev_link_t *link)
     if (link->state & DEV_CONFIG)
         fdomain_release(link);
 
-    if (link->handle)
-        pcmcia_deregister_client(link->handle);
-    
     /* Unlink device structure, free bits */
     *linkp = link->next;
     kfree(link->priv);
@@ -288,11 +286,6 @@ static int fdomain_event(event_t event, int priority,
     DEBUG(1, "fdomain_event(0x%06x)\n", event);
     
     switch (event) {
-    case CS_EVENT_CARD_REMOVAL:
-        link->state &= ~DEV_PRESENT;
-        if (link->state & DEV_CONFIG)
-            fdomain_release(link);
-        break;
     case CS_EVENT_CARD_INSERTION:
         link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
         fdomain_config(link);
@@ -317,7 +310,7 @@ static struct pcmcia_driver fdomain_cs_driver = {
         },
         .attach         = fdomain_attach,
         .event          = fdomain_event,
-        .detach         = fdomain_detach,
+        .remove         = fdomain_detach,
         .id_table       = fdomain_ids,
         .suspend        = fdomain_suspend,
         .resume         = fdomain_resume,
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index 870e87180d12..e40a8c22aa9d 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -1646,7 +1646,7 @@ static dev_link_t *nsp_cs_attach(void)
         ret = pcmcia_register_client(&link->handle, &client_reg);
         if (ret != CS_SUCCESS) {
                 cs_error(link->handle, RegisterClient, ret);
-                nsp_cs_detach(link);
+                nsp_cs_detach(link->handle);
                 return NULL;
         }
 
@@ -1662,8 +1662,9 @@ static dev_link_t *nsp_cs_attach(void)
     structures are freed.  Otherwise, the structures will be freed
     when the device is released.
 ======================================================================*/
-static void nsp_cs_detach(dev_link_t *link)
+static void nsp_cs_detach(struct pcmcia_device *p_dev)
 {
+        dev_link_t *link = dev_to_instance(p_dev);
         dev_link_t **linkp;
 
         nsp_dbg(NSP_DEBUG_INIT, "in, link=0x%p", link);
@@ -1678,12 +1679,9 @@ static void nsp_cs_detach(dev_link_t *link)
                 return;
         }
 
-        if (link->state & DEV_CONFIG)
+        if (link->state & DEV_CONFIG) {
+                ((scsi_info_t *)link->priv)->stop = 1;
                 nsp_cs_release(link);
-
-        /* Break the link with Card Services */
-        if (link->handle) {
-                pcmcia_deregister_client(link->handle);
         }
 
         /* Unlink device structure, free bits */
@@ -2096,15 +2094,6 @@ static int nsp_cs_event(event_t		       event,
         nsp_dbg(NSP_DEBUG_INIT, "in, event=0x%08x", event);
 
         switch (event) {
-        case CS_EVENT_CARD_REMOVAL:
-                nsp_dbg(NSP_DEBUG_INIT, "event: remove");
-                link->state &= ~DEV_PRESENT;
-                if (link->state & DEV_CONFIG) {
-                        ((scsi_info_t *)link->priv)->stop = 1;
-                        nsp_cs_release(link);
-                }
-                break;
-
         case CS_EVENT_CARD_INSERTION:
                 nsp_dbg(NSP_DEBUG_INIT, "event: insert");
                 link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
@@ -2144,7 +2133,7 @@ static struct pcmcia_driver nsp_driver = {
         },
         .attach         = nsp_cs_attach,
         .event          = nsp_cs_event,
-        .detach         = nsp_cs_detach,
+        .remove         = nsp_cs_detach,
         .id_table       = nsp_cs_ids,
         .suspend        = nsp_cs_suspend,
         .resume         = nsp_cs_resume,
diff --git a/drivers/scsi/pcmcia/nsp_cs.h b/drivers/scsi/pcmcia/nsp_cs.h
index f8b943082717..d276c469edf1 100644
--- a/drivers/scsi/pcmcia/nsp_cs.h
+++ b/drivers/scsi/pcmcia/nsp_cs.h
@@ -297,7 +297,7 @@ typedef struct _nsp_hw_data {
 
 /* Card service functions */
 static dev_link_t *nsp_cs_attach (void);
-static void        nsp_cs_detach (dev_link_t *link);
+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 int         nsp_cs_event  (event_t event, int priority, event_callback_args_t *args);
diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c
index 2541a999a0e5..8351dc234ffb 100644
--- a/drivers/scsi/pcmcia/qlogic_stub.c
+++ b/drivers/scsi/pcmcia/qlogic_stub.c
@@ -101,7 +101,7 @@ static void qlogic_release(dev_link_t *link);
 static int qlogic_event(event_t event, int priority, event_callback_args_t * args);
 
 static dev_link_t *qlogic_attach(void);
-static void qlogic_detach(dev_link_t *);
+static void qlogic_detach(struct pcmcia_device *p_dev);
 
 
 static dev_link_t *dev_list = NULL;
@@ -198,7 +198,7 @@ static dev_link_t *qlogic_attach(void)
         ret = pcmcia_register_client(&link->handle, &client_reg);
         if (ret != 0) {
                 cs_error(link->handle, RegisterClient, ret);
-                qlogic_detach(link);
+                qlogic_detach(link->handle);
                 return NULL;
         }
 
@@ -207,8 +207,9 @@ static dev_link_t *qlogic_attach(void)
 
 /*====================================================================*/
 
-static void qlogic_detach(dev_link_t * link)
+static void qlogic_detach(struct pcmcia_device *p_dev)
 {
+        dev_link_t *link = dev_to_instance(p_dev);
         dev_link_t **linkp;
 
         DEBUG(0, "qlogic_detach(0x%p)\n", link);
@@ -223,9 +224,6 @@ static void qlogic_detach(dev_link_t * link)
         if (link->state & DEV_CONFIG)
                 qlogic_release(link);
 
-        if (link->handle)
-                pcmcia_deregister_client(link->handle);
-
         /* Unlink device structure, free bits */
         *linkp = link->next;
         kfree(link->priv);
@@ -390,11 +388,6 @@ static int qlogic_event(event_t event, int priority, event_callback_args_t * arg
         DEBUG(1, "qlogic_event(0x%06x)\n", event);
 
         switch (event) {
-        case CS_EVENT_CARD_REMOVAL:
-                link->state &= ~DEV_PRESENT;
-                if (link->state & DEV_CONFIG)
-                        qlogic_release(link);
-                break;
         case CS_EVENT_CARD_INSERTION:
                 link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
                 qlogic_config(link);
@@ -432,7 +425,7 @@ static struct pcmcia_driver qlogic_cs_driver = {
         },
         .attach         = qlogic_attach,
         .event          = qlogic_event,
-        .detach         = qlogic_detach,
+        .remove         = qlogic_detach,
         .id_table       = qlogic_ids,
         .suspend        = qlogic_suspend,
         .resume         = qlogic_resume,
diff --git a/drivers/scsi/pcmcia/sym53c500_cs.c b/drivers/scsi/pcmcia/sym53c500_cs.c
index c4e3e2294c66..a0f8e2691f9c 100644
--- a/drivers/scsi/pcmcia/sym53c500_cs.c
+++ b/drivers/scsi/pcmcia/sym53c500_cs.c
@@ -918,11 +918,6 @@ SYM53C500_event(event_t event, int priority, event_callback_args_t *args)
         DEBUG(1, "SYM53C500_event(0x%06x)\n", event);
 
         switch (event) {
-        case CS_EVENT_CARD_REMOVAL:
-                link->state &= ~DEV_PRESENT;
-                if (link->state & DEV_CONFIG)
-                        SYM53C500_release(link);
-                break;
         case CS_EVENT_CARD_INSERTION:
                 link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
                 SYM53C500_config(link);
@@ -932,8 +927,9 @@ SYM53C500_event(event_t event, int priority, event_callback_args_t *args)
 } /* SYM53C500_event */
 
 static void
-SYM53C500_detach(dev_link_t *link)
+SYM53C500_detach(struct pcmcia_device *p_dev)
 {
+        dev_link_t *link = dev_to_instance(p_dev);
         dev_link_t **linkp;
 
         DEBUG(0, "SYM53C500_detach(0x%p)\n", link);
@@ -948,9 +944,6 @@ SYM53C500_detach(dev_link_t *link)
         if (link->state & DEV_CONFIG)
                 SYM53C500_release(link);
 
-        if (link->handle)
-                pcmcia_deregister_client(link->handle);
-
         /* Unlink device structure, free bits. */
         *linkp = link->next;
         kfree(link->priv);
@@ -993,7 +986,7 @@ SYM53C500_attach(void)
         ret = pcmcia_register_client(&link->handle, &client_reg);
         if (ret != 0) {
                 cs_error(link->handle, RegisterClient, ret);
-                SYM53C500_detach(link);
+                SYM53C500_detach(link->handle);
                 return NULL;
         }
 
@@ -1019,7 +1012,7 @@ static struct pcmcia_driver sym53c500_cs_driver = {
         },
         .attach         = SYM53C500_attach,
         .event          = SYM53C500_event,
-        .detach         = SYM53C500_detach,
+        .remove         = SYM53C500_detach,
         .id_table       = sym53c500_ids,
         .suspend        = sym53c500_suspend,
         .resume         = sym53c500_resume,