diff options
author | Luotao Fu <lfu@pengutronix.de> | 2008-12-04 01:23:18 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-12-04 01:23:18 -0500 |
commit | 48502180e4b47fb2b1e7834fe0f16f4e553a053d (patch) | |
tree | cf16bd9da31f54d0dc17bfdbd086272b85b9f2ec /drivers/net | |
parent | 999890b21a8eff7559a140fcbd2cd4b34e685c76 (diff) |
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>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/smc91x.c | 36 | ||||
-rw-r--r-- | drivers/net/smc91x.h | 13 |
2 files changed, 0 insertions, 49 deletions
diff --git a/drivers/net/smc91x.c b/drivers/net/smc91x.c index 54912aadf4b2..b215a8d85e62 100644 --- a/drivers/net/smc91x.c +++ b/drivers/net/smc91x.c | |||
@@ -90,33 +90,6 @@ static const char version[] = | |||
90 | 90 | ||
91 | #include "smc91x.h" | 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 | #ifndef SMC_NOWAIT | 93 | #ifndef SMC_NOWAIT |
121 | # define SMC_NOWAIT 0 | 94 | # define SMC_NOWAIT 0 |
122 | #endif | 95 | #endif |
@@ -2314,15 +2287,6 @@ static struct platform_driver smc_driver = { | |||
2314 | 2287 | ||
2315 | static int __init smc_init(void) | 2288 | static int __init smc_init(void) |
2316 | { | 2289 | { |
2317 | #ifdef MODULE | ||
2318 | #ifdef CONFIG_ISA | ||
2319 | if (io == -1) | ||
2320 | printk(KERN_WARNING | ||
2321 | "%s: You shouldn't use auto-probing with insmod!\n", | ||
2322 | CARDNAME); | ||
2323 | #endif | ||
2324 | #endif | ||
2325 | |||
2326 | return platform_driver_register(&smc_driver); | 2290 | return platform_driver_register(&smc_driver); |
2327 | } | 2291 | } |
2328 | 2292 | ||
diff --git a/drivers/net/smc91x.h b/drivers/net/smc91x.h index f6d637968eda..3e7c6a3cbc65 100644 --- a/drivers/net/smc91x.h +++ b/drivers/net/smc91x.h | |||
@@ -265,19 +265,6 @@ SMC_outw(u16 val, void __iomem *ioaddr, int reg) | |||
265 | 265 | ||
266 | #define SMC_IRQ_FLAGS (0) | 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 | #elif defined(CONFIG_M32R) | 268 | #elif defined(CONFIG_M32R) |
282 | 269 | ||
283 | #define SMC_CAN_USE_8BIT 0 | 270 | #define SMC_CAN_USE_8BIT 0 |