Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

smc91x: remove isa stuff from smc91x driver

ISA support in smc91x is incomplete. I doubt there're any smc91x isa card.
This driver is greatly used on arm pxa platforms. Hence we remove the
isa stuff from smc91x driver.

Signed-off-by: Luotao Fu <lfu@pengutronix.de>
Acked-by: Steve Glendinning <steve.glendinning@smsc.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Luotao Fu and committed by
David S. Miller
48502180 999890b2

-49
-36
drivers/net/smc91x.c
··· 90 90 91 91 #include "smc91x.h" 92 92 93 - #ifdef CONFIG_ISA 94 - /* 95 - * the LAN91C111 can be at any of the following port addresses. To change, 96 - * for a slightly different card, you can add it to the array. Keep in 97 - * mind that the array must end in zero. 98 - */ 99 - static unsigned int smc_portlist[] __initdata = { 100 - 0x200, 0x220, 0x240, 0x260, 0x280, 0x2A0, 0x2C0, 0x2E0, 101 - 0x300, 0x320, 0x340, 0x360, 0x380, 0x3A0, 0x3C0, 0x3E0, 0 102 - }; 103 - 104 - #ifndef SMC_IOADDR 105 - # define SMC_IOADDR -1 106 - #endif 107 - static unsigned long io = SMC_IOADDR; 108 - module_param(io, ulong, 0400); 109 - MODULE_PARM_DESC(io, "I/O base address"); 110 - 111 - #ifndef SMC_IRQ 112 - # define SMC_IRQ -1 113 - #endif 114 - static int irq = SMC_IRQ; 115 - module_param(irq, int, 0400); 116 - MODULE_PARM_DESC(irq, "IRQ number"); 117 - 118 - #endif /* CONFIG_ISA */ 119 - 120 93 #ifndef SMC_NOWAIT 121 94 # define SMC_NOWAIT 0 122 95 #endif ··· 2287 2314 2288 2315 static int __init smc_init(void) 2289 2316 { 2290 - #ifdef MODULE 2291 - #ifdef CONFIG_ISA 2292 - if (io == -1) 2293 - printk(KERN_WARNING 2294 - "%s: You shouldn't use auto-probing with insmod!\n", 2295 - CARDNAME); 2296 - #endif 2297 - #endif 2298 - 2299 2317 return platform_driver_register(&smc_driver); 2300 2318 } 2301 2319
-13
drivers/net/smc91x.h
··· 265 265 266 266 #define SMC_IRQ_FLAGS (0) 267 267 268 - #elif defined(CONFIG_ISA) 269 - 270 - #define SMC_CAN_USE_8BIT 1 271 - #define SMC_CAN_USE_16BIT 1 272 - #define SMC_CAN_USE_32BIT 0 273 - 274 - #define SMC_inb(a, r) inb((a) + (r)) 275 - #define SMC_inw(a, r) inw((a) + (r)) 276 - #define SMC_outb(v, a, r) outb(v, (a) + (r)) 277 - #define SMC_outw(v, a, r) outw(v, (a) + (r)) 278 - #define SMC_insw(a, r, p, l) insw((a) + (r), p, l) 279 - #define SMC_outsw(a, r, p, l) outsw((a) + (r), p, l) 280 - 281 268 #elif defined(CONFIG_M32R) 282 269 283 270 #define SMC_CAN_USE_8BIT 0