1 files changed, 73 insertions, 135 deletions

diff --git a/drivers/net/wireless/orinoco_cs.c b/drivers/net/wireless/orinoco_cs.c
index dc1128a00971..b664708481cc 100644
--- a/drivers/net/wireless/orinoco_cs.c
+++ b/drivers/net/wireless/orinoco_cs.c
@@ -43,17 +43,6 @@ module_param(ignore_cis_vcc, int, 0);
 MODULE_PARM_DESC(ignore_cis_vcc, "Allow voltage mismatch between card and socket");
 
 /********************************************************************/
-/* Magic constants                                                  */
-/********************************************************************/
-
-/*
- * The dev_info variable is the "key" that is used to match up this
- * device driver with appropriate cards, through the card
- * configuration database.
- */
-static dev_info_t dev_info = DRIVER_NAME;
-
-/********************************************************************/
 /* Data structures                                                  */
 /********************************************************************/
 
@@ -69,19 +58,14 @@ struct orinoco_pccard {
         unsigned long hard_reset_in_progress; 
 };
 
-/*
- * A linked list of "instances" of the device.  Each actual PCMCIA
- * card corresponds to one device instance, and is described by one
- * dev_link_t structure (defined in ds.h).
- */
-static dev_link_t *dev_list; /* = NULL */
 
 /********************************************************************/
 /* Function prototypes                                              */
 /********************************************************************/
 
+static void orinoco_cs_config(dev_link_t *link);
 static void orinoco_cs_release(dev_link_t *link);
-static void orinoco_cs_detach(dev_link_t *link);
+static void orinoco_cs_detach(struct pcmcia_device *p_dev);
 
 /********************************************************************/
 /* Device methods                                                   */
@@ -119,19 +103,17 @@ orinoco_cs_hard_reset(struct orinoco_private *priv)
  * The dev_link structure is initialized, but we don't actually
  * configure the card at this point -- we wait until we receive a card
  * insertion event.  */
-static dev_link_t *
-orinoco_cs_attach(void)
+static int
+orinoco_cs_attach(struct pcmcia_device *p_dev)
 {
         struct net_device *dev;
         struct orinoco_private *priv;
         struct orinoco_pccard *card;
         dev_link_t *link;
-        client_reg_t client_reg;
-        int ret;
 
         dev = alloc_orinocodev(sizeof(*card), orinoco_cs_hard_reset);
         if (! dev)
-                return NULL;
+                return -ENOMEM;
         priv = netdev_priv(dev);
         card = priv->card;
 
@@ -154,22 +136,15 @@ orinoco_cs_attach(void)
         link->conf.IntType = INT_MEMORY_AND_IO;
 
         /* Register with Card Services */
-        /* FIXME: need a lock? */
-        link->next = dev_list;
-        dev_list = link;
-
-        client_reg.dev_info = &dev_info;
-        client_reg.Version = 0x0210; /* FIXME: what does this mean? */
-        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);
-                orinoco_cs_detach(link);
-                return NULL;
-        }
+        link->next = NULL;
+
+        link->handle = p_dev;
+        p_dev->instance = link;
+
+        link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
+        orinoco_cs_config(link);
 
-        return link;
+        return 0;
 }                               /* orinoco_cs_attach */
 
 /*
@@ -178,27 +153,14 @@ orinoco_cs_attach(void)
  * are freed.  Otherwise, the structures will be freed when the device
  * is released.
  */
-static void orinoco_cs_detach(dev_link_t *link)
+static void orinoco_cs_detach(struct pcmcia_device *p_dev)
 {
-        dev_link_t **linkp;
+        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *dev = link->priv;
 
-        /* Locate device structure */
-        for (linkp = &dev_list; *linkp; linkp = &(*linkp)->next)
-                if (*linkp == link)
-                        break;
-
-        BUG_ON(*linkp == NULL);
-
         if (link->state & DEV_CONFIG)
                 orinoco_cs_release(link);
 
-        /* Break the link with Card Services */
-        if (link->handle)
-                pcmcia_deregister_client(link->handle);
-
-        /* Unlink device structure, and free it */
-        *linkp = link->next;
         DEBUG(0, PFX "detach: link=%p link->dev=%p\n", link, link->dev);
         if (link->dev) {
                 DEBUG(0, PFX "About to unregister net device %p\n",
@@ -465,106 +427,82 @@ orinoco_cs_release(dev_link_t *link)
                 ioport_unmap(priv->hw.iobase);
 }                               /* orinoco_cs_release */
 
-/*
- * The card status event handler.  Mostly, this schedules other stuff
- * to run after an event is received.
- */
-static int
-orinoco_cs_event(event_t event, int priority,
-                       event_callback_args_t * args)
+static int orinoco_cs_suspend(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 = link->priv;
         struct orinoco_private *priv = netdev_priv(dev);
         struct orinoco_pccard *card = priv->card;
         int err = 0;
         unsigned long flags;
 
-        switch (event) {
-        case CS_EVENT_CARD_REMOVAL:
-                link->state &= ~DEV_PRESENT;
-                if (link->state & DEV_CONFIG) {
-                        unsigned long flags;
-
+        link->state |= DEV_SUSPEND;
+        if (link->state & DEV_CONFIG) {
+                /* This is probably racy, but I can't think of
+                   a better way, short of rewriting the PCMCIA
+                   layer to not suck :-( */
+                if (! test_bit(0, &card->hard_reset_in_progress)) {
                         spin_lock_irqsave(&priv->lock, flags);
+
+                        err = __orinoco_down(dev);
+                        if (err)
+                                printk(KERN_WARNING "%s: Error %d downing interface\n",
+                                       dev->name, err);
+
                         netif_device_detach(dev);
                         priv->hw_unavailable++;
+
                         spin_unlock_irqrestore(&priv->lock, flags);
                 }
-                break;
 
-        case CS_EVENT_CARD_INSERTION:
-                link->state |= DEV_PRESENT | DEV_CONFIG_PENDING;
-                orinoco_cs_config(link);
-                break;
+                pcmcia_release_configuration(link->handle);
+        }
 
-        case CS_EVENT_PM_SUSPEND:
-                link->state |= DEV_SUSPEND;
-                /* Fall through... */
-        case CS_EVENT_RESET_PHYSICAL:
-                /* Mark the device as stopped, to block IO until later */
-                if (link->state & DEV_CONFIG) {
-                        /* This is probably racy, but I can't think of
-                           a better way, short of rewriting the PCMCIA
-                           layer to not suck :-( */
-                        if (! test_bit(0, &card->hard_reset_in_progress)) {
-                                spin_lock_irqsave(&priv->lock, flags);
-
-                                err = __orinoco_down(dev);
-                                if (err)
-                                        printk(KERN_WARNING "%s: %s: Error %d downing interface\n",
-                                               dev->name,
-                                               event == CS_EVENT_PM_SUSPEND ? "SUSPEND" : "RESET_PHYSICAL",
-                                               err);
-                                
-                                netif_device_detach(dev);
-                                priv->hw_unavailable++;
-
-                                spin_unlock_irqrestore(&priv->lock, flags);
+        return 0;
+}
+
+static int orinoco_cs_resume(struct pcmcia_device *p_dev)
+{
+        dev_link_t *link = dev_to_instance(p_dev);
+        struct net_device *dev = link->priv;
+        struct orinoco_private *priv = netdev_priv(dev);
+        struct orinoco_pccard *card = priv->card;
+        int err = 0;
+        unsigned long flags;
+
+        link->state &= ~DEV_SUSPEND;
+        if (link->state & DEV_CONFIG) {
+                /* FIXME: should we double check that this is
+                 * the same card as we had before */
+                pcmcia_request_configuration(link->handle, &link->conf);
+
+                if (! test_bit(0, &card->hard_reset_in_progress)) {
+                        err = orinoco_reinit_firmware(dev);
+                        if (err) {
+                                printk(KERN_ERR "%s: Error %d re-initializing firmware\n",
+                                       dev->name, err);
+                                return -EIO;
                         }
 
-                        pcmcia_release_configuration(link->handle);
-                }
-                break;
+                        spin_lock_irqsave(&priv->lock, flags);
+
+                        netif_device_attach(dev);
+                        priv->hw_unavailable--;
 
-        case CS_EVENT_PM_RESUME:
-                link->state &= ~DEV_SUSPEND;
-                /* Fall through... */
-        case CS_EVENT_CARD_RESET:
-                if (link->state & DEV_CONFIG) {
-                        /* FIXME: should we double check that this is
-                         * the same card as we had before */
-                        pcmcia_request_configuration(link->handle, &link->conf);
-
-                        if (! test_bit(0, &card->hard_reset_in_progress)) {
-                                err = orinoco_reinit_firmware(dev);
-                                if (err) {
-                                        printk(KERN_ERR "%s: Error %d re-initializing firmware\n",
+                        if (priv->open && ! priv->hw_unavailable) {
+                                err = __orinoco_up(dev);
+                                if (err)
+                                        printk(KERN_ERR "%s: Error %d restarting card\n",
                                                dev->name, err);
-                                        break;
-                                }
-                                
-                                spin_lock_irqsave(&priv->lock, flags);
-                                
-                                netif_device_attach(dev);
-                                priv->hw_unavailable--;
-                                
-                                if (priv->open && ! priv->hw_unavailable) {
-                                        err = __orinoco_up(dev);
-                                        if (err)
-                                                printk(KERN_ERR "%s: Error %d restarting card\n",
-                                                       dev->name, err);
-                                        
-                                }
-
-                                spin_unlock_irqrestore(&priv->lock, flags);
                         }
+
+                        spin_unlock_irqrestore(&priv->lock, flags);
                 }
-                break;
         }
 
-        return err;
-}                               /* orinoco_cs_event */
+        return 0;
+}
+
 
 /********************************************************************/
 /* Module initialization                                            */
@@ -665,10 +603,11 @@ static struct pcmcia_driver orinoco_driver = {
         .drv            = {
                 .name   = DRIVER_NAME,
         },
-        .attach         = orinoco_cs_attach,
-        .detach         = orinoco_cs_detach,
-        .event          = orinoco_cs_event,
+        .probe          = orinoco_cs_attach,
+        .remove         = orinoco_cs_detach,
         .id_table       = orinoco_cs_ids,
+        .suspend        = orinoco_cs_suspend,
+        .resume         = orinoco_cs_resume,
 };
 
 static int __init
@@ -683,7 +622,6 @@ static void __exit
 exit_orinoco_cs(void)
 {
         pcmcia_unregister_driver(&orinoco_driver);
-        BUG_ON(dev_list != NULL);
 }
 
 module_init(init_orinoco_cs);