aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/3c503.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/3c503.c')
-rw-r--r--drivers/net/3c503.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/3c503.c b/drivers/net/3c503.c
index cb5ef75450dc..64313e3dfcb8 100644
--- a/drivers/net/3c503.c
+++ b/drivers/net/3c503.c
@@ -81,7 +81,7 @@ static void el2_get_8390_hdr(struct net_device *dev, struct e8390_pkt_hdr *hdr,
81 int ring_page); 81 int ring_page);
82static struct ethtool_ops netdev_ethtool_ops; 82static struct ethtool_ops netdev_ethtool_ops;
83 83
84 84
85/* This routine probes for a memory-mapped 3c503 board by looking for 85/* This routine probes for a memory-mapped 3c503 board by looking for
86 the "location register" at the end of the jumpered boot PROM space. 86 the "location register" at the end of the jumpered boot PROM space.
87 This works even if a PROM isn't there. 87 This works even if a PROM isn't there.
@@ -96,7 +96,7 @@ static int __init do_el2_probe(struct net_device *dev)
96 int irq = dev->irq; 96 int irq = dev->irq;
97 97
98 SET_MODULE_OWNER(dev); 98 SET_MODULE_OWNER(dev);
99 99
100 if (base_addr > 0x1ff) /* Check a single specified location. */ 100 if (base_addr > 0x1ff) /* Check a single specified location. */
101 return el2_probe1(dev, base_addr); 101 return el2_probe1(dev, base_addr);
102 else if (base_addr != 0) /* Don't probe at all. */ 102 else if (base_addr != 0) /* Don't probe at all. */
@@ -127,7 +127,7 @@ static int __init do_el2_probe(struct net_device *dev)
127 127
128/* Try all of the locations that aren't obviously empty. This touches 128/* Try all of the locations that aren't obviously empty. This touches
129 a lot of locations, and is much riskier than the code above. */ 129 a lot of locations, and is much riskier than the code above. */
130static int __init 130static int __init
131el2_pio_probe(struct net_device *dev) 131el2_pio_probe(struct net_device *dev)
132{ 132{
133 int i; 133 int i;
@@ -173,7 +173,7 @@ out:
173/* Probe for the Etherlink II card at I/O port base IOADDR, 173/* Probe for the Etherlink II card at I/O port base IOADDR,
174 returning non-zero on success. If found, set the station 174 returning non-zero on success. If found, set the station
175 address and memory parameters in DEVICE. */ 175 address and memory parameters in DEVICE. */
176static int __init 176static int __init
177el2_probe1(struct net_device *dev, int ioaddr) 177el2_probe1(struct net_device *dev, int ioaddr)
178{ 178{
179 int i, iobase_reg, membase_reg, saved_406, wordlength, retval; 179 int i, iobase_reg, membase_reg, saved_406, wordlength, retval;
@@ -367,7 +367,7 @@ out:
367 release_region(ioaddr, EL2_IO_EXTENT); 367 release_region(ioaddr, EL2_IO_EXTENT);
368 return retval; 368 return retval;
369} 369}
370 370
371static int 371static int
372el2_open(struct net_device *dev) 372el2_open(struct net_device *dev)
373{ 373{
@@ -385,7 +385,7 @@ el2_open(struct net_device *dev)
385 outb_p(0x04 << ((*irqp == 9) ? 2 : *irqp), E33G_IDCFR); 385 outb_p(0x04 << ((*irqp == 9) ? 2 : *irqp), E33G_IDCFR);
386 outb_p(0x00, E33G_IDCFR); 386 outb_p(0x00, E33G_IDCFR);
387 if (*irqp == probe_irq_off(cookie) /* It's a good IRQ line! */ 387 if (*irqp == probe_irq_off(cookie) /* It's a good IRQ line! */
388 && ((retval = request_irq(dev->irq = *irqp, 388 && ((retval = request_irq(dev->irq = *irqp,
389 ei_interrupt, 0, dev->name, dev)) == 0)) 389 ei_interrupt, 0, dev->name, dev)) == 0))
390 break; 390 break;
391 } 391 }