1 files changed, 31 insertions, 36 deletions

diff --git a/drivers/net/wireless/wavelan_cs.c b/drivers/net/wireless/wavelan_cs.c
index baa1011e70e..352d4a50b79 100644
--- a/drivers/net/wireless/wavelan_cs.c
+++ b/drivers/net/wireless/wavelan_cs.c
@@ -1005,7 +1005,7 @@ static inline void
 wv_82593_reconfig(struct net_device *   dev)
 {
   net_local *           lp = netdev_priv(dev);
-  dev_link_t *          link = lp->link;
+  struct pcmcia_device *                link = lp->link;
   unsigned long         flags;
 
   /* Arm the flag, will be cleard in wv_82593_config() */
@@ -3744,16 +3744,16 @@ wv_pcmcia_reset(struct net_device *	dev)
 {
   int           i;
   conf_reg_t    reg = { 0, CS_READ, CISREG_COR, 0 };
-  dev_link_t *  link = ((net_local *)netdev_priv(dev))->link;
+  struct pcmcia_device *        link = ((net_local *)netdev_priv(dev))->link;
 
 #ifdef DEBUG_CONFIG_TRACE
   printk(KERN_DEBUG "%s: ->wv_pcmcia_reset()\n", dev->name);
 #endif
 
-  i = pcmcia_access_configuration_register(link->handle, &reg);
+  i = pcmcia_access_configuration_register(link, &reg);
   if(i != CS_SUCCESS)
     {
-      cs_error(link->handle, AccessConfigurationRegister, i);
+      cs_error(link, AccessConfigurationRegister, i);
       return FALSE;
     }
       
@@ -3764,19 +3764,19 @@ wv_pcmcia_reset(struct net_device *	dev)
 
   reg.Action = CS_WRITE;
   reg.Value = reg.Value | COR_SW_RESET;
-  i = pcmcia_access_configuration_register(link->handle, &reg);
+  i = pcmcia_access_configuration_register(link, &reg);
   if(i != CS_SUCCESS)
     {
-      cs_error(link->handle, AccessConfigurationRegister, i);
+      cs_error(link, AccessConfigurationRegister, i);
       return FALSE;
     }
       
   reg.Action = CS_WRITE;
   reg.Value = COR_LEVEL_IRQ | COR_CONFIG;
-  i = pcmcia_access_configuration_register(link->handle, &reg);
+  i = pcmcia_access_configuration_register(link, &reg);
   if(i != CS_SUCCESS)
     {
-      cs_error(link->handle, AccessConfigurationRegister, i);
+      cs_error(link, AccessConfigurationRegister, i);
       return FALSE;
     }
 
@@ -3940,9 +3940,8 @@ wv_hw_reset(struct net_device *	dev)
  * (called by wavelan_event())
  */
 static inline int
-wv_pcmcia_config(dev_link_t *   link)
+wv_pcmcia_config(struct pcmcia_device * link)
 {
-  client_handle_t       handle = link->handle;
   tuple_t               tuple;
   cisparse_t            parse;
   struct net_device *   dev = (struct net_device *) link->priv;
@@ -3965,16 +3964,16 @@ wv_pcmcia_config(dev_link_t *	link)
     {
       tuple.Attributes = 0;
       tuple.DesiredTuple = CISTPL_CONFIG;
-      i = pcmcia_get_first_tuple(handle, &tuple);
+      i = pcmcia_get_first_tuple(link, &tuple);
       if(i != CS_SUCCESS)
         break;
       tuple.TupleData = (cisdata_t *)buf;
       tuple.TupleDataMax = 64;
       tuple.TupleOffset = 0;
-      i = pcmcia_get_tuple_data(handle, &tuple);
+      i = pcmcia_get_tuple_data(link, &tuple);
       if(i != CS_SUCCESS)
         break;
-      i = pcmcia_parse_tuple(handle, &tuple, &parse);
+      i = pcmcia_parse_tuple(link, &tuple, &parse);
       if(i != CS_SUCCESS)
         break;
       link->conf.ConfigBase = parse.config.base;
@@ -3983,7 +3982,7 @@ wv_pcmcia_config(dev_link_t *	link)
   while(0);
   if(i != CS_SUCCESS)
     {
-      cs_error(link->handle, ParseTuple, i);
+      cs_error(link, ParseTuple, i);
       link->state &= ~DEV_CONFIG_PENDING;
       return FALSE;
     }
@@ -3992,10 +3991,10 @@ wv_pcmcia_config(dev_link_t *	link)
   link->state |= DEV_CONFIG;
   do
     {
-      i = pcmcia_request_io(link->handle, &link->io);
+      i = pcmcia_request_io(link, &link->io);
       if(i != CS_SUCCESS)
         {
-          cs_error(link->handle, RequestIO, i);
+          cs_error(link, RequestIO, i);
           break;
         }
 
@@ -4003,10 +4002,10 @@ wv_pcmcia_config(dev_link_t *	link)
        * Now allocate an interrupt line.  Note that this does not
        * actually assign a handler to the interrupt.
        */
-      i = pcmcia_request_irq(link->handle, &link->irq);
+      i = pcmcia_request_irq(link, &link->irq);
       if(i != CS_SUCCESS)
         {
-          cs_error(link->handle, RequestIRQ, i);
+          cs_error(link, RequestIRQ, i);
           break;
         }
 
@@ -4015,15 +4014,15 @@ wv_pcmcia_config(dev_link_t *	link)
        * the I/O windows and the interrupt mapping.
        */
       link->conf.ConfigIndex = 1;
-      i = pcmcia_request_configuration(link->handle, &link->conf);
+      i = pcmcia_request_configuration(link, &link->conf);
       if(i != CS_SUCCESS)
         {
-          cs_error(link->handle, RequestConfiguration, i);
+          cs_error(link, RequestConfiguration, i);
           break;
         }
 
       /*
-       * Allocate a small memory window.  Note that the dev_link_t
+       * Allocate a small memory window.  Note that the struct pcmcia_device
        * structure provides space for one window handle -- if your
        * device needs several windows, you'll need to keep track of
        * the handles in your private data structure, link->priv.
@@ -4031,10 +4030,10 @@ wv_pcmcia_config(dev_link_t *	link)
       req.Attributes = WIN_DATA_WIDTH_8|WIN_MEMORY_TYPE_AM|WIN_ENABLE;
       req.Base = req.Size = 0;
       req.AccessSpeed = mem_speed;
-      i = pcmcia_request_window(&link->handle, &req, &link->win);
+      i = pcmcia_request_window(&link, &req, &link->win);
       if(i != CS_SUCCESS)
         {
-          cs_error(link->handle, RequestWindow, i);
+          cs_error(link, RequestWindow, i);
           break;
         }
 
@@ -4046,7 +4045,7 @@ wv_pcmcia_config(dev_link_t *	link)
       i = pcmcia_map_mem_page(link->win, &mem);
       if(i != CS_SUCCESS)
         {
-          cs_error(link->handle, MapMemPage, i);
+          cs_error(link, MapMemPage, i);
           break;
         }
 
@@ -4060,7 +4059,7 @@ wv_pcmcia_config(dev_link_t *	link)
              lp->mem, dev->irq, (u_int) dev->base_addr);
 #endif
 
-      SET_NETDEV_DEV(dev, &handle_to_dev(handle));
+      SET_NETDEV_DEV(dev, &handle_to_dev(link));
       i = register_netdev(dev);
       if(i != 0)
         {
@@ -4096,7 +4095,7 @@ wv_pcmcia_config(dev_link_t *	link)
  * still open, this will be postponed until it is closed.
  */
 static void
-wv_pcmcia_release(dev_link_t *link)
+wv_pcmcia_release(struct pcmcia_device *link)
 {
         struct net_device *     dev = (struct net_device *) link->priv;
         net_local *             lp = netdev_priv(dev);
@@ -4106,7 +4105,7 @@ wv_pcmcia_release(dev_link_t *link)
 #endif
 
         iounmap(lp->mem);
-        pcmcia_disable_device(link->handle);
+        pcmcia_disable_device(link);
 
 #ifdef DEBUG_CONFIG_TRACE
         printk(KERN_DEBUG "%s: <- wv_pcmcia_release()\n", dev->name);
@@ -4473,7 +4472,7 @@ static int
 wavelan_open(struct net_device *        dev)
 {
   net_local *   lp = netdev_priv(dev);
-  dev_link_t *  link = lp->link;
+  struct pcmcia_device *        link = lp->link;
   kio_addr_t    base = dev->base_addr;
 
 #ifdef DEBUG_CALLBACK_TRACE
@@ -4527,7 +4526,7 @@ wavelan_open(struct net_device *	dev)
 static int
 wavelan_close(struct net_device *       dev)
 {
-  dev_link_t *  link = ((net_local *)netdev_priv(dev))->link;
+  struct pcmcia_device *        link = ((net_local *)netdev_priv(dev))->link;
   kio_addr_t    base = dev->base_addr;
 
 #ifdef DEBUG_CALLBACK_TRACE
@@ -4673,10 +4672,8 @@ wavelan_attach(struct pcmcia_device *p_dev)
  * is released.
  */
 static void
-wavelan_detach(struct pcmcia_device *p_dev)
+wavelan_detach(struct pcmcia_device *link)
 {
-   dev_link_t *link = dev_to_instance(p_dev);
-
 #ifdef DEBUG_CALLBACK_TRACE
   printk(KERN_DEBUG "-> wavelan_detach(0x%p)\n", link);
 #endif
@@ -4713,9 +4710,8 @@ wavelan_detach(struct pcmcia_device *p_dev)
 #endif
 }
 
-static int wavelan_suspend(struct pcmcia_device *p_dev)
+static int wavelan_suspend(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *     dev = (struct net_device *) link->priv;
 
         /* NB: wavelan_close will be called, but too late, so we are
@@ -4736,9 +4732,8 @@ static int wavelan_suspend(struct pcmcia_device *p_dev)
         return 0;
 }
 
-static int wavelan_resume(struct pcmcia_device *p_dev)
+static int wavelan_resume(struct pcmcia_device *link)
 {
-        dev_link_t *link = dev_to_instance(p_dev);
         struct net_device *     dev = (struct net_device *) link->priv;
 
         link->state &= ~DEV_SUSPEND;