Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f9097dce5d799462e086adca28815dac5006bb30

Authored by Komuro
Committed by Dominik Brodowski
1 parent f3d4ae431d
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

pcmcia: remove irq_list parameter from pd6729 

Remoe the irq_list parameter from pd6729, as it can and should be set
via sysfs (and -- if available -- pcmciautils, which reads the information
from /etc/pcmcia/config.opts )

[linux@dominikbrodowski.net: updated commit message]
Signed-off-by: Komuro <komurojun-mbn@nifty.com>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

Showing 1 changed file with 1 additions and 17 deletions Side-by-side Diff

drivers/pcmcia/pd6729.c
Diff comments   View file @ f9097dc
... ... @@ -48,23 +48,13 @@
48 48 * Specifies the interrupt delivery mode. The default (1) is to use PCI
49 49 * interrupts; a value of 0 selects ISA interrupts. This must be set for
50 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 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 55 module_param(irq_mode, int, 0444);
64   -module_param_array(irq_list, int, &irq_list_count, 0444);
65 56 MODULE_PARM_DESC(irq_mode,
66 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 59 static DEFINE_SPINLOCK(port_lock);
70 60  
... ... @@ -605,13 +595,7 @@
605 595 return 0;
606 596 }
607 597  
608   - if (irq_list_count == 0)
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;
  598 + mask0 = PD67_MASK;
615 599  
616 600 /* just find interrupts that aren't in use */
617 601 for (i = 0; i < 16; i++)