diff options
| -rw-r--r-- | drivers/pcmcia/pd6729.c | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/drivers/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c index e1741cd875aa..7c204910a777 100644 --- a/drivers/pcmcia/pd6729.c +++ b/drivers/pcmcia/pd6729.c | |||
| @@ -48,23 +48,13 @@ MODULE_AUTHOR("Jun Komuro <komurojun-mbn@nifty.com>"); | |||
| 48 | * Specifies the interrupt delivery mode. The default (1) is to use PCI | 48 | * Specifies the interrupt delivery mode. The default (1) is to use PCI |
| 49 | * interrupts; a value of 0 selects ISA interrupts. This must be set for | 49 | * interrupts; a value of 0 selects ISA interrupts. This must be set for |
| 50 | * correct operation of PCI card readers. | 50 | * correct operation of PCI card readers. |
| 51 | * | ||
| 52 | * irq_list=i,j,... | ||
| 53 | * This list limits the set of interrupts that can be used by PCMCIA | ||
| 54 | * cards. | ||
| 55 | * The default list is 3,4,5,7,9,10,11. | ||
| 56 | * (irq_list parameter is not used, if irq_mode = 1) | ||
| 57 | */ | 51 | */ |
| 58 | 52 | ||
| 59 | static int irq_mode = 1; /* 0 = ISA interrupt, 1 = PCI interrupt */ | 53 | static int irq_mode = 1; /* 0 = ISA interrupt, 1 = PCI interrupt */ |
| 60 | static int irq_list[16]; | ||
| 61 | static unsigned int irq_list_count = 0; | ||
| 62 | 54 | ||
| 63 | module_param(irq_mode, int, 0444); | 55 | module_param(irq_mode, int, 0444); |
| 64 | module_param_array(irq_list, int, &irq_list_count, 0444); | ||
| 65 | MODULE_PARM_DESC(irq_mode, | 56 | MODULE_PARM_DESC(irq_mode, |
| 66 | "interrupt delivery mode. 0 = ISA, 1 = PCI. default is 1"); | 57 | "interrupt delivery mode. 0 = ISA, 1 = PCI. default is 1"); |
| 67 | MODULE_PARM_DESC(irq_list, "interrupts that can be used by PCMCIA cards"); | ||
| 68 | 58 | ||
| 69 | static DEFINE_SPINLOCK(port_lock); | 59 | static DEFINE_SPINLOCK(port_lock); |
| 70 | 60 | ||
| @@ -605,13 +595,7 @@ static u_int __devinit pd6729_isa_scan(void) | |||
| 605 | return 0; | 595 | return 0; |
| 606 | } | 596 | } |
| 607 | 597 | ||
| 608 | if (irq_list_count == 0) | 598 | mask0 = PD67_MASK; |
| 609 | mask0 = 0xffff; | ||
| 610 | else | ||
| 611 | for (i = mask0 = 0; i < irq_list_count; i++) | ||
| 612 | mask0 |= (1<<irq_list[i]); | ||
| 613 | |||
| 614 | mask0 &= PD67_MASK; | ||
| 615 | 599 | ||
| 616 | /* just find interrupts that aren't in use */ | 600 | /* just find interrupts that aren't in use */ |
| 617 | for (i = 0; i < 16; i++) | 601 | for (i = 0; i < 16; i++) |
