cyclades: allow overriding ISA defaults also when the driver is built-in
PATCH 1/1 cyclades: allow overriding ISA defaults also when the driver is built-in
From: Bartlomiej Zolnierkiewicz <[email protected]>
Subject: [PATCH] cyclades: allow overriding ISA defaults also when the driver is built-in
Signed-off-by Bartlomiej Zolnierkiewicz <[email protected]>
--- drivers/char/cyclades.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/char/cyclades.c +1 -8
@@ -158,13 +158,11 @@ static unsigned int cy_isa_addresses[] =#define NR_ISA_ADDRS ARRAY_SIZE(cy_isa_addresses) -#ifdef MODULE static long maddr[NR_CARDS ];static int irq[NR_CARDS ];module_param_array (maddr, long,NULL ,0 );module_param_array (irq, int,NULL ,0 ); -#endif #endif /* CONFIG_ISA */
@@ -3319,13 +3317,10 @@ static int __init cy_detect_isa(void)unsigned short cy_isa_irq, nboard;void __iomem *cy_isa_address;unsigned short i, j, cy_isa_nchan; -#ifdef MODULE int isparam =0 ; -#endif nboard =0 ; -#ifdef MODULE /* Check for module parameters */ for (i =0 ; i <NR_CARDS ; i++) {if (maddr[i] || i) {
@@ -3335,7 +3330,6 @@ static int __init cy_detect_isa(void)if (!maddr[i])break ; } -#endif /* scan the address table probing for Cyclom-Y/ISA boards */ for (i =0 ; i <NR_ISA_ADDRS ; i++) {
@@ -3356,11 +3350,10 @@ static int __init cy_detect_isa(void)iounmap (cy_isa_address);continue ; } -#ifdef MODULE +if (isparam && irq[i]) cy_isa_irq = irq[i];else -#endif /* find out the board's irq by probing */ cy_isa_irq =detect_isa_irq (cy_isa_address);if (cy_isa_irq ==0 ) {
Quoted 1 line · Bartlomiej Zolnierkiewicz
Subject: [PATCH] cyclades: allow overriding ISA defaults also when the driver is built-in
Thanks, I rebased it on the top of Roel Kluin's fix.