[PATCH] Hostap_cs: Remove irq_list, irq_mask and pcmcia/version.h

[Jar]

Remove irq_list, irq_mask and pcmcia/version.h as suggested in 
http://kernel.org/pub/linux/utils/kernel/pcmcia/pcmcia.html

o pcmcia/version.h should not be used (as of 2.6.13) [*]
This file will be removed eventually.

o irq_mask and irq_list parameters (as of 2.6.11) [*]
The irq_mask and irq_list parameters should no longer be used in PCMCIA 
card drivers. Instead, it is the job of the PCMCIA core to determine 
which IRQ should be used. Therefore, link->irq.IRQInfo2 is ignored.

--- 2.6.13-rc3-mm1/drivers/net/wireless/hostap/hostap_cs.c.orig 
2005-07-16 00:11:24.000000000 +0300
+++ 2.6.13-rc3-mm1/drivers/net/wireless/hostap/hostap_cs.c 
2005-07-16 00:41:53.000000000 +0300
@@ -12,7 +12,6 @@
  #include <linux/wireless.h>
  #include <net/iw_handler.h>

-#include <pcmcia/version.h>
  #include <pcmcia/cs_types.h>
  #include <pcmcia/cs.h>
  #include <pcmcia/cistpl.h>
@@ -35,12 +34,6 @@
  MODULE_LICENSE("GPL");


-static int irq_mask = 0xdeb8;
-module_param(irq_mask, int, 0444);
-
-static int irq_list[4] = { -1 };
-module_param_array(irq_list, int, NULL, 0444);
-
  static int ignore_cis_vcc;
  module_param(ignore_cis_vcc, int, 0444);
  MODULE_PARM_DESC(ignore_cis_vcc, "Ignore broken CIS VCC entry");
@@ -749,14 +742,8 @@
          * irq structure is initialized.
          */
         if (link->conf.Attributes & CONF_ENABLE_IRQ) {
-               int i;
                 link->irq.Attributes = IRQ_TYPE_EXCLUSIVE | 
IRQ_HANDLE_PRESENT;
-               link->irq.IRQInfo1 = IRQ_INFO2_VALID | IRQ_LEVEL_ID;
-               if (irq_list[0] == -1)
-                       link->irq.IRQInfo2 = irq_mask;
-               else
-                       for (i = 0; i < 4; i++)
-                               link->irq.IRQInfo2 |= 1 << irq_list[i];
+               link->irq.IRQInfo1 = IRQ_LEVEL_ID;
                 link->irq.Handler = prism2_interrupt;
                 link->irq.Instance = dev;
                 CS_CHECK(RequestIRQ,


-- 
Best Regards, Jar