[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, 49 insertions, 39 deletions

diff --git a/drivers/net/wireless/hostap/hostap_cs.c b/drivers/net/wireless/hostap/hostap_cs.c
index 2643976a6677..ba4a7da98ccd 100644
--- a/drivers/net/wireless/hostap/hostap_cs.c
+++ b/drivers/net/wireless/hostap/hostap_cs.c
@@ -846,20 +846,64 @@ static void prism2_release(u_long arg)
         PDEBUG(DEBUG_FLOW, "release - done\n");
 }
 
+static int hostap_cs_suspend(struct pcmcia_device *p_dev)
+{
+        dev_link_t *link = dev_to_instance(p_dev);
+        struct net_device *dev = (struct net_device *) link->priv;
+        int dev_open = 0;
 
-static int prism2_event(event_t event, int priority,
-                        event_callback_args_t *args)
+        PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_PM_SUSPEND\n", dev_info);
+
+        link->state |= DEV_SUSPEND;
+
+        if (link->state & DEV_CONFIG) {
+                struct hostap_interface *iface = netdev_priv(dev);
+                if (iface && iface->local)
+                        dev_open = iface->local->num_dev_open > 0;
+                if (dev_open) {
+                        netif_stop_queue(dev);
+                        netif_device_detach(dev);
+                }
+                prism2_suspend(dev);
+                pcmcia_release_configuration(link->handle);
+        }
+
+        return 0;
+}
+
+static int hostap_cs_resume(struct pcmcia_device *p_dev)
 {
-        dev_link_t *link = args->client_data;
+        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = (struct net_device *) link->priv;
         int dev_open = 0;
 
+        PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_PM_RESUME\n", dev_info);
+
+        link->state &= ~DEV_SUSPEND;
         if (link->state & DEV_CONFIG) {
                 struct hostap_interface *iface = netdev_priv(dev);
                 if (iface && iface->local)
                         dev_open = iface->local->num_dev_open > 0;
+
+                pcmcia_request_configuration(link->handle, &link->conf);
+
+                prism2_hw_shutdown(dev, 1);
+                prism2_hw_config(dev, dev_open ? 0 : 1);
+                if (dev_open) {
+                        netif_device_attach(dev);
+                        netif_start_queue(dev);
+                }
         }
 
+        return 0;
+}
+
+static int prism2_event(event_t event, int priority,
+                        event_callback_args_t *args)
+{
+        dev_link_t *link = args->client_data;
+        struct net_device *dev = (struct net_device *) link->priv;
+
         switch (event) {
         case CS_EVENT_CARD_INSERTION:
                 PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_CARD_INSERTION\n", dev_info);
@@ -879,42 +923,6 @@ static int prism2_event(event_t event, int priority,
                 }
                 break;
 
-        case CS_EVENT_PM_SUSPEND:
-                PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_PM_SUSPEND\n", dev_info);
-                link->state |= DEV_SUSPEND;
-                /* fall through */
-
-        case CS_EVENT_RESET_PHYSICAL:
-                PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_RESET_PHYSICAL\n", dev_info);
-                if (link->state & DEV_CONFIG) {
-                        if (dev_open) {
-                                netif_stop_queue(dev);
-                                netif_device_detach(dev);
-                        }
-                        prism2_suspend(dev);
-                        pcmcia_release_configuration(link->handle);
-                }
-                break;
-
-        case CS_EVENT_PM_RESUME:
-                PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_PM_RESUME\n", dev_info);
-                link->state &= ~DEV_SUSPEND;
-                /* fall through */
-
-        case CS_EVENT_CARD_RESET:
-                PDEBUG(DEBUG_EXTRA, "%s: CS_EVENT_CARD_RESET\n", dev_info);
-                if (link->state & DEV_CONFIG) {
-                        pcmcia_request_configuration(link->handle,
-                                                     &link->conf);
-                        prism2_hw_shutdown(dev, 1);
-                        prism2_hw_config(dev, dev_open ? 0 : 1);
-                        if (dev_open) {
-                                netif_device_attach(dev);
-                                netif_start_queue(dev);
-                        }
-                }
-                break;
-
         default:
                 PDEBUG(DEBUG_EXTRA, "%s: prism2_event() - unknown event %d\n",
                        dev_info, event);
@@ -987,6 +995,8 @@ static struct pcmcia_driver hostap_driver = {
         .owner          = THIS_MODULE,
         .event          = prism2_event,
         .id_table       = hostap_cs_ids,
+        .suspend        = hostap_cs_suspend,
+        .resume         = hostap_cs_resume,
 };
 
 static int __init init_prism2_pccard(void)