[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>

1 files changed, 25 insertions, 25 deletions

diff --git a/drivers/char/pcmcia/cm4040_cs.c b/drivers/char/pcmcia/cm4040_cs.c
index 4c698d908ffa..3622fd39c47b 100644
--- a/drivers/char/pcmcia/cm4040_cs.c
+++ b/drivers/char/pcmcia/cm4040_cs.c
@@ -656,31 +656,7 @@ static int reader_event(event_t event, int priority,
                         DEBUGP(5, dev, "CS_EVENT_CARD_REMOVAL\n");
                         link->state &= ~DEV_PRESENT;
                         break;
-                case CS_EVENT_PM_SUSPEND:
-                        DEBUGP(5, dev, "CS_EVENT_PM_SUSPEND "
-                              "(fall-through to CS_EVENT_RESET_PHYSICAL)\n");
-                        link->state |= DEV_SUSPEND;
-
-                case CS_EVENT_RESET_PHYSICAL:
-                        DEBUGP(5, dev, "CS_EVENT_RESET_PHYSICAL\n");
-                        if (link->state & DEV_CONFIG) {
-                                DEBUGP(5, dev, "ReleaseConfiguration\n");
-                                pcmcia_release_configuration(link->handle);
-                        }
-                        break;
-                case CS_EVENT_PM_RESUME:
-                        DEBUGP(5, dev, "CS_EVENT_PM_RESUME "
-                              "(fall-through to CS_EVENT_CARD_RESET)\n");
-                        link->state &= ~DEV_SUSPEND;
-
-                case CS_EVENT_CARD_RESET:
-                        DEBUGP(5, dev, "CS_EVENT_CARD_RESET\n");
-                        if ((link->state & DEV_CONFIG)) {
-                                DEBUGP(5, dev, "RequestConfiguration\n");
-                                pcmcia_request_configuration(link->handle,
-                                                             &link->conf);
-                        }
-                        break;
+
                 default:
                         DEBUGP(5, dev, "reader_event: unknown event %.2x\n",
                                event);
@@ -690,6 +666,28 @@ static int reader_event(event_t event, int priority,
         return CS_SUCCESS;
 }
 
+static int reader_suspend(struct pcmcia_device *p_dev)
+{
+        dev_link_t *link = dev_to_instance(p_dev);
+
+        link->state |= DEV_SUSPEND;
+        if (link->state & DEV_CONFIG)
+                pcmcia_release_configuration(link->handle);
+
+        return 0;
+}
+
+static int reader_resume(struct pcmcia_device *p_dev)
+{
+        dev_link_t *link = dev_to_instance(p_dev);
+
+        link->state &= ~DEV_SUSPEND;
+        if (link->state & DEV_CONFIG)
+                pcmcia_request_configuration(link->handle, &link->conf);
+
+        return 0;
+}
+
 static void reader_release(dev_link_t *link)
 {
         cm4040_reader_release(link->priv);
@@ -806,6 +804,8 @@ static struct pcmcia_driver reader_driver = {
         },
         .attach         = reader_attach,
         .detach         = reader_detach,
+        .suspend        = reader_suspend,
+        .resume         = reader_resume,
         .event          = reader_event,
         .id_table       = cm4040_ids,
 };