Skip to content

L
linux
Commit 1d15f977 authored by Dave Jones's avatar Dave Jones Committed by Linus Torvalds
Browse files
Options

[PATCH] Whitespace fixes. 

No code changes, but lots of trivial whitespace cleaning, and
removal of a bogus set of 'defaults' at the bottom of the file.
parent 9c717ad2
Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 105 deletions
drivers/net/3c509.c
View file @ 1d15f977
...@@ -355,21 +355,21 @@ static int __init el3_common_init(struct net_device *dev) ...@@ -355,21 +355,21 @@ static int __init el3_common_init(struct net_device *dev)
static void el3_common_remove (struct net_device *dev) static void el3_common_remove (struct net_device *dev)
{ {
struct el3_private *lp = netdev_priv(dev); struct el3_private *lp = netdev_priv(dev);
(void) lp; /* Keep gcc quiet... */ (void) lp; /* Keep gcc quiet... */
#ifdef CONFIG_PM #ifdef CONFIG_PM
if (lp->pmdev) if (lp->pmdev)
pm_unregister(lp->pmdev); pm_unregister(lp->pmdev);
#endif #endif
#if defined(__ISAPNP__) && !defined(CONFIG_X86_PC9800) #if defined(__ISAPNP__) && !defined(CONFIG_X86_PC9800)
if (lp->type == EL3_PNP) if (lp->type == EL3_PNP)
pnp_device_detach(to_pnp_dev(lp->dev)); pnp_device_detach(to_pnp_dev(lp->dev));
#endif #endif
unregister_netdev (dev); unregister_netdev (dev);
release_region(dev->base_addr, EL3_IO_EXTENT); release_region(dev->base_addr, EL3_IO_EXTENT);
free_netdev (dev); free_netdev (dev);
} }
static int __init el3_probe(int card_idx) static int __init el3_probe(int card_idx)
...@@ -397,9 +397,9 @@ static int __init el3_probe(int card_idx) ...@@ -397,9 +397,9 @@ static int __init el3_probe(int card_idx)
if (pnp_device_attach(idev) < 0) if (pnp_device_attach(idev) < 0)
continue; continue;
if (pnp_activate_dev(idev) < 0) { if (pnp_activate_dev(idev) < 0) {
__again: __again:
pnp_device_detach(idev); pnp_device_detach(idev);
continue; continue;
} }
if (!pnp_port_valid(idev, 0) || !pnp_irq_valid(idev, 0)) if (!pnp_port_valid(idev, 0) || !pnp_irq_valid(idev, 0))
goto __again; goto __again;
...@@ -612,79 +612,80 @@ static int __init el3_probe(int card_idx) ...@@ -612,79 +612,80 @@ static int __init el3_probe(int card_idx)
} }
#ifdef CONFIG_MCA #ifdef CONFIG_MCA
static int __init el3_mca_probe(struct device *device) { static int __init el3_mca_probe(struct device *device)
/* Based on Erik Nygren's (nygren@mit.edu) 3c529 patch, {
* heavily modified by Chris Beauregard /* Based on Erik Nygren's (nygren@mit.edu) 3c529 patch,
* (cpbeaure@csclub.uwaterloo.ca) to support standard MCA * heavily modified by Chris Beauregard
* probing. * (cpbeaure@csclub.uwaterloo.ca) to support standard MCA
* * probing.
* redone for multi-card detection by ZP Gu (zpg@castle.net) *
* now works as a module */ * redone for multi-card detection by ZP Gu (zpg@castle.net)
* now works as a module */
struct el3_private *lp;
short i;
int ioaddr, irq, if_port;
u16 phys_addr[3];
struct net_device *dev = NULL;
u_char pos4, pos5;
struct mca_device *mdev = to_mca_device(device);
int slot = mdev->slot;
int err;
pos4 = mca_device_read_stored_pos(mdev, 4);
pos5 = mca_device_read_stored_pos(mdev, 5);
ioaddr = ((short)((pos4&0xfc)|0x02)) << 8;
irq = pos5 & 0x0f;
printk("3c529: found %s at slot %d\n",
el3_mca_adapter_names[mdev->index], slot + 1);
/* claim the slot */
strncpy(mdev->name, el3_mca_adapter_names[mdev->index],
sizeof(mdev->name));
mca_device_set_claim(mdev, 1);
if_port = pos4 & 0x03;
irq = mca_device_transform_irq(mdev, irq);
ioaddr = mca_device_transform_ioport(mdev, ioaddr);
if (el3_debug > 2) {
printk("3c529: irq %d ioaddr 0x%x ifport %d\n", irq, ioaddr, if_port);
}
EL3WINDOW(0);
for (i = 0; i < 3; i++) {
phys_addr[i] = htons(read_eeprom(ioaddr, i));
}
dev = alloc_etherdev(sizeof (struct el3_private)); struct el3_private *lp;
if (dev == NULL) { short i;
release_region(ioaddr, EL3_IO_EXTENT); int ioaddr, irq, if_port;
return -ENOMEM; u16 phys_addr[3];
} struct net_device *dev = NULL;
u_char pos4, pos5;
struct mca_device *mdev = to_mca_device(device);
int slot = mdev->slot;
int err;
SET_MODULE_OWNER(dev); pos4 = mca_device_read_stored_pos(mdev, 4);
netdev_boot_setup_check(dev); pos5 = mca_device_read_stored_pos(mdev, 5);
memcpy(dev->dev_addr, phys_addr, sizeof(phys_addr)); ioaddr = ((short)((pos4&0xfc)|0x02)) << 8;
dev->base_addr = ioaddr; irq = pos5 & 0x0f;
dev->irq = irq;
dev->if_port = if_port;
lp = netdev_priv(dev); printk("3c529: found %s at slot %d\n",
lp->dev = device; el3_mca_adapter_names[mdev->index], slot + 1);
lp->type = EL3_MCA;
device->driver_data = dev; /* claim the slot */
err = el3_common_init(dev); strncpy(mdev->name, el3_mca_adapter_names[mdev->index],
sizeof(mdev->name));
if (err) { mca_device_set_claim(mdev, 1);
device->driver_data = NULL;
free_netdev(dev); if_port = pos4 & 0x03;
irq = mca_device_transform_irq(mdev, irq);
ioaddr = mca_device_transform_ioport(mdev, ioaddr);
if (el3_debug > 2) {
printk("3c529: irq %d ioaddr 0x%x ifport %d\n", irq, ioaddr, if_port);
}
EL3WINDOW(0);
for (i = 0; i < 3; i++) {
phys_addr[i] = htons(read_eeprom(ioaddr, i));
}
dev = alloc_etherdev(sizeof (struct el3_private));
if (dev == NULL) {
release_region(ioaddr, EL3_IO_EXTENT);
return -ENOMEM; return -ENOMEM;
} }
el3_cards++; SET_MODULE_OWNER(dev);
return 0; netdev_boot_setup_check(dev);
memcpy(dev->dev_addr, phys_addr, sizeof(phys_addr));
dev->base_addr = ioaddr;
dev->irq = irq;
dev->if_port = if_port;
lp = netdev_priv(dev);
lp->dev = device;
lp->type = EL3_MCA;
device->driver_data = dev;
err = el3_common_init(dev);
if (err) {
device->driver_data = NULL;
free_netdev(dev);
return -ENOMEM;
}
el3_cards++;
return 0;
} }
#endif /* CONFIG_MCA */ #endif /* CONFIG_MCA */
...@@ -713,15 +714,15 @@ static int __init el3_eisa_probe (struct device *device) ...@@ -713,15 +714,15 @@ static int __init el3_eisa_probe (struct device *device)
irq = inw(ioaddr + WN0_IRQ) >> 12; irq = inw(ioaddr + WN0_IRQ) >> 12;
if_port = inw(ioaddr + 6)>>14; if_port = inw(ioaddr + 6)>>14;
for (i = 0; i < 3; i++) for (i = 0; i < 3; i++)
phys_addr[i] = htons(read_eeprom(ioaddr, i)); phys_addr[i] = htons(read_eeprom(ioaddr, i));
/* Restore the "Product ID" to the EEPROM read register. */ /* Restore the "Product ID" to the EEPROM read register. */
read_eeprom(ioaddr, 3); read_eeprom(ioaddr, 3);
dev = alloc_etherdev(sizeof (struct el3_private)); dev = alloc_etherdev(sizeof (struct el3_private));
if (dev == NULL) { if (dev == NULL) {
release_region(ioaddr, EL3_IO_EXTENT); release_region(ioaddr, EL3_IO_EXTENT);
return -ENOMEM; return -ENOMEM;
} }
SET_MODULE_OWNER(dev); SET_MODULE_OWNER(dev);
...@@ -755,12 +756,12 @@ static int __init el3_eisa_probe (struct device *device) ...@@ -755,12 +756,12 @@ static int __init el3_eisa_probe (struct device *device)
* The net dev must be stored in the driver_data field */ * The net dev must be stored in the driver_data field */
static int __devexit el3_device_remove (struct device *device) static int __devexit el3_device_remove (struct device *device)
{ {
struct net_device *dev; struct net_device *dev;
dev = device->driver_data; dev = device->driver_data;
el3_common_remove (dev); el3_common_remove (dev);
return 0; return 0;
} }
#endif #endif
...@@ -810,7 +811,8 @@ el3_open(struct net_device *dev) ...@@ -810,7 +811,8 @@ el3_open(struct net_device *dev)
outw(SetStatusEnb | 0x00, ioaddr + EL3_CMD); outw(SetStatusEnb | 0x00, ioaddr + EL3_CMD);
i = request_irq(dev->irq, &el3_interrupt, 0, dev->name, dev); i = request_irq(dev->irq, &el3_interrupt, 0, dev->name, dev);
if (i) return i; if (i)
return i;
EL3WINDOW(0); EL3WINDOW(0);
if (el3_debug > 3) if (el3_debug > 3)
...@@ -891,8 +893,8 @@ el3_start_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -891,8 +893,8 @@ el3_start_xmit(struct sk_buff *skb, struct net_device *dev)
* time sensitive devices. * time sensitive devices.
*/ */
spin_lock_irqsave(&lp->lock, flags); spin_lock_irqsave(&lp->lock, flags);
/* Put out the doubleword header... */ /* Put out the doubleword header... */
outw(skb->len, ioaddr + TX_FIFO); outw(skb->len, ioaddr + TX_FIFO);
outw(0x00, ioaddr + TX_FIFO); outw(0x00, ioaddr + TX_FIFO);
...@@ -1164,7 +1166,7 @@ set_multicast_list(struct net_device *dev) ...@@ -1164,7 +1166,7 @@ set_multicast_list(struct net_device *dev)
outw(SetRxFilter | RxStation | RxMulticast | RxBroadcast, ioaddr + EL3_CMD); outw(SetRxFilter | RxStation | RxMulticast | RxBroadcast, ioaddr + EL3_CMD);
} }
else else
outw(SetRxFilter | RxStation | RxBroadcast, ioaddr + EL3_CMD); outw(SetRxFilter | RxStation | RxBroadcast, ioaddr + EL3_CMD);
spin_unlock_irqrestore(&lp->lock, flags); spin_unlock_irqrestore(&lp->lock, flags);
} }
...@@ -1183,10 +1185,10 @@ el3_close(struct net_device *dev) ...@@ -1183,10 +1185,10 @@ el3_close(struct net_device *dev)
/* Switching back to window 0 disables the IRQ. */ /* Switching back to window 0 disables the IRQ. */
EL3WINDOW(0); EL3WINDOW(0);
if (lp->type != EL3_EISA) { if (lp->type != EL3_EISA) {
/* But we explicitly zero the IRQ line select anyway. Don't do /* But we explicitly zero the IRQ line select anyway. Don't do
* it on EISA cards, it prevents the module from getting an * it on EISA cards, it prevents the module from getting an
* IRQ after unload+reload... */ * IRQ after unload+reload... */
outw(0x0f00, ioaddr + WN0_IRQ); outw(0x0f00, ioaddr + WN0_IRQ);
} }
return 0; return 0;
...@@ -1654,7 +1656,7 @@ static int __init el3_init_module(void) ...@@ -1654,7 +1656,7 @@ static int __init el3_init_module(void)
#ifdef CONFIG_EISA #ifdef CONFIG_EISA
if (eisa_driver_register (&el3_eisa_driver) < 0) { if (eisa_driver_register (&el3_eisa_driver) < 0) {
eisa_driver_unregister (&el3_eisa_driver); eisa_driver_unregister (&el3_eisa_driver);
} }
#endif #endif
#ifdef CONFIG_MCA #ifdef CONFIG_MCA
...@@ -1686,11 +1688,3 @@ static void __exit el3_cleanup_module(void) ...@@ -1686,11 +1688,3 @@ static void __exit el3_cleanup_module(void)
module_init (el3_init_module); module_init (el3_init_module);
module_exit (el3_cleanup_module); module_exit (el3_cleanup_module);
/*
* Local variables:
* compile-command: "gcc -DMODULE -D__KERNEL__ -Wall -Wstrict-prototypes -O6 -c 3c509.c"
* version-control: t
* kept-new-versions: 5
* tab-width: 4
* End:
*/
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7