[PATCH] pcmcia: new suspend core

Move the suspend and resume methods out of the event handler, and into
special functions. Also use these functions for pre- and post-reset, as
almost all drivers already do, and the remaining ones can easily be
converted.

Bugfix to include/pcmcia/ds.c
Signed-off-by: Andrew Morton <akpm@osdl.org>

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

5 files changed, 186 insertions, 134 deletions

diff --git a/drivers/scsi/pcmcia/aha152x_stub.c b/drivers/scsi/pcmcia/aha152x_stub.c
index 7c5306499832..82988a3e35ec 100644
--- a/drivers/scsi/pcmcia/aha152x_stub.c
+++ b/drivers/scsi/pcmcia/aha152x_stub.c
@@ -272,11 +272,37 @@ static void aha152x_release_cs(dev_link_t *link)
         link->state &= ~DEV_CONFIG;
 }
 
+static int aha152x_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);
+
+        return 0;
+}
+
+static int aha152x_resume(struct pcmcia_device *dev)
+{
+        dev_link_t *link = dev_to_instance(dev);
+        scsi_info_t *info = link->priv;
+
+        link->state &= ~DEV_SUSPEND;
+        if (link->state & DEV_CONFIG) {
+                Scsi_Cmnd tmp;
+                pcmcia_request_configuration(link->handle, &link->conf);
+                tmp.device->host = info->host;
+                aha152x_host_reset(&tmp);
+        }
+
+        return 0;
+}
+
 static int aha152x_event(event_t event, int priority,
                          event_callback_args_t *args)
 {
     dev_link_t *link = args->client_data;
-    scsi_info_t *info = link->priv;
     
     DEBUG(0, "aha152x_event(0x%06x)\n", event);
     
@@ -290,24 +316,6 @@ static int aha152x_event(event_t event, int priority,
         link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
         aha152x_config_cs(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 (link->state & DEV_CONFIG) {
-            Scsi_Cmnd tmp;
-            pcmcia_request_configuration(link->handle, &link->conf);
-            tmp.device->host = info->host;
-            aha152x_host_reset(&tmp);
-        }
-        break;
     }
     return 0;
 }
@@ -331,6 +339,8 @@ static struct pcmcia_driver aha152x_cs_driver = {
         .event          = aha152x_event,
         .detach         = aha152x_detach,
         .id_table       = aha152x_ids,
+        .suspend        = aha152x_suspend,
+        .resume         = aha152x_resume,
 };
 
 static int __init init_aha152x_cs(void)
diff --git a/drivers/scsi/pcmcia/fdomain_stub.c b/drivers/scsi/pcmcia/fdomain_stub.c
index db8f5cd85ffe..9e1d68c14694 100644
--- a/drivers/scsi/pcmcia/fdomain_stub.c
+++ b/drivers/scsi/pcmcia/fdomain_stub.c
@@ -256,6 +256,30 @@ static void fdomain_release(dev_link_t *link)
 
 /*====================================================================*/
 
+static int fdomain_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);
+
+        return 0;
+}
+
+static int fdomain_resume(struct pcmcia_device *dev)
+{
+        dev_link_t *link = dev_to_instance(dev);
+
+        link->state &= ~DEV_SUSPEND;
+        if (link->state & DEV_CONFIG) {
+                pcmcia_request_configuration(link->handle, &link->conf);
+                fdomain_16x0_bus_reset(NULL);
+        }
+
+        return 0;
+}
+
 static int fdomain_event(event_t event, int priority,
                         event_callback_args_t *args)
 {
@@ -273,22 +297,6 @@ static int fdomain_event(event_t event, int priority,
         link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
         fdomain_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 (link->state & DEV_CONFIG) {
-            pcmcia_request_configuration(link->handle, &link->conf);
-            fdomain_16x0_bus_reset(NULL);
-        }
-        break;
     }
     return 0;
 } /* fdomain_event */
@@ -311,6 +319,8 @@ static struct pcmcia_driver fdomain_cs_driver = {
         .event          = fdomain_event,
         .detach         = fdomain_detach,
         .id_table       = fdomain_ids,
+        .suspend        = fdomain_suspend,
+        .resume         = fdomain_resume,
 };
 
 static int __init init_fdomain_cs(void)
diff --git a/drivers/scsi/pcmcia/nsp_cs.c b/drivers/scsi/pcmcia/nsp_cs.c
index 050ea13ff80b..870e87180d12 100644
--- a/drivers/scsi/pcmcia/nsp_cs.c
+++ b/drivers/scsi/pcmcia/nsp_cs.c
@@ -2021,6 +2021,59 @@ static void nsp_cs_release(dev_link_t *link)
 #endif
 } /* nsp_cs_release */
 
+static int nsp_cs_suspend(struct pcmcia_device *dev)
+{
+        dev_link_t *link = dev_to_instance(dev);
+        scsi_info_t *info = link->priv;
+        nsp_hw_data *data;
+
+        link->state |= DEV_SUSPEND;
+
+        nsp_dbg(NSP_DEBUG_INIT, "event: suspend");
+
+        if (info->host != NULL) {
+                nsp_msg(KERN_INFO, "clear SDTR status");
+
+                data = (nsp_hw_data *)info->host->hostdata;
+
+                nsphw_init_sync(data);
+        }
+
+        info->stop = 1;
+
+        if (link->state & DEV_CONFIG)
+                pcmcia_release_configuration(link->handle);
+
+        return 0;
+}
+
+static int nsp_cs_resume(struct pcmcia_device *dev)
+{
+        dev_link_t *link = dev_to_instance(dev);
+        scsi_info_t *info = link->priv;
+        nsp_hw_data *data;
+
+        nsp_dbg(NSP_DEBUG_INIT, "event: resume");
+
+        link->state &= ~DEV_SUSPEND;
+
+        if (link->state & DEV_CONFIG)
+                pcmcia_request_configuration(link->handle, &link->conf);
+
+        info->stop = 0;
+
+        if (info->host != NULL) {
+                nsp_msg(KERN_INFO, "reset host and bus");
+
+                data = (nsp_hw_data *)info->host->hostdata;
+
+                nsphw_init   (data);
+                nsp_bus_reset(data);
+        }
+
+        return 0;
+}
+
 /*======================================================================
 
     The card status event handler.  Mostly, this schedules other
@@ -2039,8 +2092,6 @@ static int nsp_cs_event(event_t		       event,
                         event_callback_args_t *args)
 {
         dev_link_t  *link = args->client_data;
-        scsi_info_t *info = link->priv;
-        nsp_hw_data *data;
 
         nsp_dbg(NSP_DEBUG_INIT, "in, event=0x%08x", event);
 
@@ -2062,51 +2113,6 @@ static int nsp_cs_event(event_t		       event,
 #endif
                 nsp_cs_config(link);
                 break;
-
-        case CS_EVENT_PM_SUSPEND:
-                nsp_dbg(NSP_DEBUG_INIT, "event: suspend");
-                link->state |= DEV_SUSPEND;
-                /* Fall through... */
-        case CS_EVENT_RESET_PHYSICAL:
-                /* Mark the device as stopped, to block IO until later */
-                nsp_dbg(NSP_DEBUG_INIT, "event: reset physical");
-
-                if (info->host != NULL) {
-                        nsp_msg(KERN_INFO, "clear SDTR status");
-
-                        data = (nsp_hw_data *)info->host->hostdata;
-
-                        nsphw_init_sync(data);
-                }
-
-                info->stop = 1;
-                if (link->state & DEV_CONFIG) {
-                        pcmcia_release_configuration(link->handle);
-                }
-                break;
-
-        case CS_EVENT_PM_RESUME:
-                nsp_dbg(NSP_DEBUG_INIT, "event: resume");
-                link->state &= ~DEV_SUSPEND;
-                /* Fall through... */
-        case CS_EVENT_CARD_RESET:
-                nsp_dbg(NSP_DEBUG_INIT, "event: reset");
-                if (link->state & DEV_CONFIG) {
-                        pcmcia_request_configuration(link->handle, &link->conf);
-                }
-                info->stop = 0;
-
-                if (info->host != NULL) {
-                        nsp_msg(KERN_INFO, "reset host and bus");
-
-                        data = (nsp_hw_data *)info->host->hostdata;
-
-                        nsphw_init   (data);
-                        nsp_bus_reset(data);
-                }
-
-                break;
-
         default:
                 nsp_dbg(NSP_DEBUG_INIT, "event: unknown");
                 break;
@@ -2140,6 +2146,8 @@ static struct pcmcia_driver nsp_driver = {
         .event          = nsp_cs_event,
         .detach         = nsp_cs_detach,
         .id_table       = nsp_cs_ids,
+        .suspend        = nsp_cs_suspend,
+        .resume         = nsp_cs_resume,
 };
 #endif
 
diff --git a/drivers/scsi/pcmcia/qlogic_stub.c b/drivers/scsi/pcmcia/qlogic_stub.c
index bb091a45a880..2541a999a0e5 100644
--- a/drivers/scsi/pcmcia/qlogic_stub.c
+++ b/drivers/scsi/pcmcia/qlogic_stub.c
@@ -349,6 +349,40 @@ static void qlogic_release(dev_link_t *link)
 
 /*====================================================================*/
 
+static int qlogic_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);
+
+        return 0;
+}
+
+static int qlogic_resume(struct pcmcia_device *dev)
+{
+        dev_link_t *link = dev_to_instance(dev);
+
+        link->state &= ~DEV_SUSPEND;
+        if (link->state & DEV_CONFIG) {
+                scsi_info_t *info = link->priv;
+
+                pcmcia_request_configuration(link->handle, &link->conf);
+                if ((info->manf_id == MANFID_MACNICA) ||
+                    (info->manf_id == MANFID_PIONEER) ||
+                    (info->manf_id == 0x0098)) {
+                        outb(0x80, link->io.BasePort1 + 0xd);
+                        outb(0x24, link->io.BasePort1 + 0x9);
+                        outb(0x04, link->io.BasePort1 + 0xd);
+                }
+                /* Ugggglllyyyy!!! */
+                qlogicfas408_bus_reset(NULL);
+        }
+
+        return 0;
+}
+
 static int qlogic_event(event_t event, int priority, event_callback_args_t * args)
 {
         dev_link_t *link = args->client_data;
@@ -365,29 +399,6 @@ static int qlogic_event(event_t event, int priority, event_callback_args_t * arg
                 link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
                 qlogic_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 (link->state & DEV_CONFIG) {
-                        scsi_info_t *info = link->priv;
-                        pcmcia_request_configuration(link->handle, &link->conf);
-                        if ((info->manf_id == MANFID_MACNICA) || (info->manf_id == MANFID_PIONEER) || (info->manf_id == 0x0098)) {
-                                outb(0x80, link->io.BasePort1 + 0xd);
-                                outb(0x24, link->io.BasePort1 + 0x9);
-                                outb(0x04, link->io.BasePort1 + 0xd);
-                        }
-                        /* Ugggglllyyyy!!! */
-                        qlogicfas408_bus_reset(NULL);
-                }
-                break;
         }
         return 0;
 }                               /* qlogic_event */
@@ -423,6 +434,8 @@ static struct pcmcia_driver qlogic_cs_driver = {
         .event          = qlogic_event,
         .detach         = qlogic_detach,
         .id_table       = qlogic_ids,
+        .suspend        = qlogic_suspend,
+        .resume         = qlogic_resume,
 };
 
 static int __init init_qlogic_cs(void)
diff --git a/drivers/scsi/pcmcia/sym53c500_cs.c b/drivers/scsi/pcmcia/sym53c500_cs.c
index 98b64b2aa8ee..c4e3e2294c66 100644
--- a/drivers/scsi/pcmcia/sym53c500_cs.c
+++ b/drivers/scsi/pcmcia/sym53c500_cs.c
@@ -872,11 +872,48 @@ cs_failed:
         return;
 } /* SYM53C500_config */
 
+static int sym53c500_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);
+
+        return 0;
+}
+
+static int sym53c500_resume(struct pcmcia_device *dev)
+{
+        dev_link_t *link = dev_to_instance(dev);
+        struct scsi_info_t *info = link->priv;
+
+        link->state &= ~DEV_SUSPEND;
+        if (link->state & DEV_CONFIG) {
+                pcmcia_request_configuration(link->handle, &link->conf);
+
+                /* See earlier comment about manufacturer IDs. */
+                if ((info->manf_id == MANFID_MACNICA) ||
+                    (info->manf_id == MANFID_PIONEER) ||
+                    (info->manf_id == 0x0098)) {
+                        outb(0x80, link->io.BasePort1 + 0xd);
+                        outb(0x24, link->io.BasePort1 + 0x9);
+                        outb(0x04, link->io.BasePort1 + 0xd);
+                }
+                /*
+                 *  If things don't work after a "resume",
+                 *  this is a good place to start looking.
+                 */
+                SYM53C500_int_host_reset(link->io.BasePort1);
+        }
+
+        return 0;
+}
+
 static int
 SYM53C500_event(event_t event, int priority, event_callback_args_t *args)
 {
         dev_link_t *link = args->client_data;
-        struct scsi_info_t *info = link->priv;
 
         DEBUG(1, "SYM53C500_event(0x%06x)\n", event);
 
@@ -890,34 +927,6 @@ SYM53C500_event(event_t event, int priority, event_callback_args_t *args)
                 link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
                 SYM53C500_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 (link->state & DEV_CONFIG) {
-                        pcmcia_request_configuration(link->handle, &link->conf);
-                        /* See earlier comment about manufacturer IDs. */
-                        if ((info->manf_id == MANFID_MACNICA) ||
-                            (info->manf_id == MANFID_PIONEER) ||
-                            (info->manf_id == 0x0098)) {
-                                outb(0x80, link->io.BasePort1 + 0xd);
-                                outb(0x24, link->io.BasePort1 + 0x9);
-                                outb(0x04, link->io.BasePort1 + 0xd);
-                        }
-                        /*
-                        *  If things don't work after a "resume",
-                        *  this is a good place to start looking.
-                        */
-                        SYM53C500_int_host_reset(link->io.BasePort1);
-                }
-                break;
         }
         return 0;
 } /* SYM53C500_event */
@@ -1012,6 +1021,8 @@ static struct pcmcia_driver sym53c500_cs_driver = {
         .event          = SYM53C500_event,
         .detach         = SYM53C500_detach,
         .id_table       = sym53c500_ids,
+        .suspend        = sym53c500_suspend,
+        .resume         = sym53c500_resume,
 };
 
 static int __init