aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/eepro100.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2006-09-13 13:24:59 -0400
committerJeff Garzik <jeff@garzik.org>2006-09-13 13:24:59 -0400
commit6aa20a2235535605db6d6d2bd850298b2fe7f31e (patch)
treedf0b855043407b831d57f2f2c271f8aab48444f4 /drivers/net/eepro100.c
parent7a291083225af6e22ffaa46b3d91cfc1a1ccaab4 (diff)
drivers/net: Trim trailing whitespace
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/eepro100.c')
-rw-r--r--drivers/net/eepro100.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/drivers/net/eepro100.c b/drivers/net/eepro100.c
index a3d515def109..4ee87903c9cf 100644
--- a/drivers/net/eepro100.c
+++ b/drivers/net/eepro100.c
@@ -496,7 +496,7 @@ static void set_rx_mode(struct net_device *dev);
496static void speedo_show_state(struct net_device *dev); 496static void speedo_show_state(struct net_device *dev);
497static struct ethtool_ops ethtool_ops; 497static struct ethtool_ops ethtool_ops;
498 498
499 499
500 500
501#ifdef honor_default_port 501#ifdef honor_default_port
502/* Optional driver feature to allow forcing the transceiver setting. 502/* Optional driver feature to allow forcing the transceiver setting.
@@ -646,7 +646,7 @@ static int __devinit speedo_found1(struct pci_dev *pdev,
646 option = 0; 646 option = 0;
647 647
648 rtnl_lock(); 648 rtnl_lock();
649 if (dev_alloc_name(dev, dev->name) < 0) 649 if (dev_alloc_name(dev, dev->name) < 0)
650 goto err_free_unlock; 650 goto err_free_unlock;
651 651
652 /* Read the station address EEPROM before doing the reset. 652 /* Read the station address EEPROM before doing the reset.
@@ -825,10 +825,10 @@ static int __devinit speedo_found1(struct pci_dev *pdev,
825 sp->mii_if.dev = dev; 825 sp->mii_if.dev = dev;
826 sp->mii_if.mdio_read = mdio_read; 826 sp->mii_if.mdio_read = mdio_read;
827 sp->mii_if.mdio_write = mdio_write; 827 sp->mii_if.mdio_write = mdio_write;
828 828
829 sp->rx_bug = (eeprom[3] & 0x03) == 3 ? 0 : 1; 829 sp->rx_bug = (eeprom[3] & 0x03) == 3 ? 0 : 1;
830 if (((pdev->device > 0x1030 && (pdev->device < 0x103F))) 830 if (((pdev->device > 0x1030 && (pdev->device < 0x103F)))
831 || (pdev->device == 0x2449) || (pdev->device == 0x2459) 831 || (pdev->device == 0x2449) || (pdev->device == 0x2459)
832 || (pdev->device == 0x245D)) { 832 || (pdev->device == 0x245D)) {
833 sp->chip_id = 1; 833 sp->chip_id = 1;
834 } 834 }
@@ -1208,7 +1208,7 @@ static void speedo_show_state(struct net_device *dev)
1208 int i; 1208 int i;
1209 1209
1210 if (netif_msg_pktdata(sp)) { 1210 if (netif_msg_pktdata(sp)) {
1211 printk(KERN_DEBUG "%s: Tx ring dump, Tx queue %u / %u:\n", 1211 printk(KERN_DEBUG "%s: Tx ring dump, Tx queue %u / %u:\n",
1212 dev->name, sp->cur_tx, sp->dirty_tx); 1212 dev->name, sp->cur_tx, sp->dirty_tx);
1213 for (i = 0; i < TX_RING_SIZE; i++) 1213 for (i = 0; i < TX_RING_SIZE; i++)
1214 printk(KERN_DEBUG "%s: %c%c%2d %8.8x.\n", dev->name, 1214 printk(KERN_DEBUG "%s: %c%c%2d %8.8x.\n", dev->name,
@@ -1586,7 +1586,7 @@ static irqreturn_t speedo_interrupt(int irq, void *dev_instance, struct pt_regs
1586 1586
1587 /* Always check if all rx buffers are allocated. --SAW */ 1587 /* Always check if all rx buffers are allocated. --SAW */
1588 speedo_refill_rx_buffers(dev, 0); 1588 speedo_refill_rx_buffers(dev, 0);
1589 1589
1590 spin_lock(&sp->lock); 1590 spin_lock(&sp->lock);
1591 /* 1591 /*
1592 * The chip may have suspended reception for various reasons. 1592 * The chip may have suspended reception for various reasons.
@@ -1607,8 +1607,8 @@ static irqreturn_t speedo_interrupt(int irq, void *dev_instance, struct pt_regs
1607 /* these are all reserved values */ 1607 /* these are all reserved values */
1608 break; 1608 break;
1609 } 1609 }
1610 1610
1611 1611
1612 /* User interrupt, Command/Tx unit interrupt or CU not active. */ 1612 /* User interrupt, Command/Tx unit interrupt or CU not active. */
1613 if (status & 0xA400) { 1613 if (status & 0xA400) {
1614 speedo_tx_buffer_gc(dev); 1614 speedo_tx_buffer_gc(dev);
@@ -1619,7 +1619,7 @@ static irqreturn_t speedo_interrupt(int irq, void *dev_instance, struct pt_regs
1619 netif_wake_queue(dev); /* Attention: under a spinlock. --SAW */ 1619 netif_wake_queue(dev); /* Attention: under a spinlock. --SAW */
1620 } 1620 }
1621 } 1621 }
1622 1622
1623 spin_unlock(&sp->lock); 1623 spin_unlock(&sp->lock);
1624 1624
1625 if (--boguscnt < 0) { 1625 if (--boguscnt < 0) {
@@ -2263,7 +2263,7 @@ static void set_rx_mode(struct net_device *dev)
2263 2263
2264 sp->rx_mode = new_rx_mode; 2264 sp->rx_mode = new_rx_mode;
2265} 2265}
2266 2266
2267#ifdef CONFIG_PM 2267#ifdef CONFIG_PM
2268static int eepro100_suspend(struct pci_dev *pdev, pm_message_t state) 2268static int eepro100_suspend(struct pci_dev *pdev, pm_message_t state)
2269{ 2269{
@@ -2275,12 +2275,12 @@ static int eepro100_suspend(struct pci_dev *pdev, pm_message_t state)
2275 2275
2276 if (!netif_running(dev)) 2276 if (!netif_running(dev))
2277 return 0; 2277 return 0;
2278 2278
2279 del_timer_sync(&sp->timer); 2279 del_timer_sync(&sp->timer);
2280 2280
2281 netif_device_detach(dev); 2281 netif_device_detach(dev);
2282 iowrite32(PortPartialReset, ioaddr + SCBPort); 2282 iowrite32(PortPartialReset, ioaddr + SCBPort);
2283 2283
2284 /* XXX call pci_set_power_state ()? */ 2284 /* XXX call pci_set_power_state ()? */
2285 pci_disable_device(pdev); 2285 pci_disable_device(pdev);
2286 pci_set_power_state (pdev, PCI_D3hot); 2286 pci_set_power_state (pdev, PCI_D3hot);
@@ -2324,7 +2324,7 @@ static void __devexit eepro100_remove_one (struct pci_dev *pdev)
2324{ 2324{
2325 struct net_device *dev = pci_get_drvdata (pdev); 2325 struct net_device *dev = pci_get_drvdata (pdev);
2326 struct speedo_private *sp = netdev_priv(dev); 2326 struct speedo_private *sp = netdev_priv(dev);
2327 2327
2328 unregister_netdev(dev); 2328 unregister_netdev(dev);
2329 2329
2330 release_region(pci_resource_start(pdev, 1), pci_resource_len(pdev, 1)); 2330 release_region(pci_resource_start(pdev, 1), pci_resource_len(pdev, 1));
@@ -2337,7 +2337,7 @@ static void __devexit eepro100_remove_one (struct pci_dev *pdev)
2337 pci_disable_device(pdev); 2337 pci_disable_device(pdev);
2338 free_netdev(dev); 2338 free_netdev(dev);
2339} 2339}
2340 2340
2341static struct pci_device_id eepro100_pci_tbl[] = { 2341static struct pci_device_id eepro100_pci_tbl[] = {
2342 { PCI_VENDOR_ID_INTEL, 0x1229, PCI_ANY_ID, PCI_ANY_ID, }, 2342 { PCI_VENDOR_ID_INTEL, 0x1229, PCI_ANY_ID, PCI_ANY_ID, },
2343 { PCI_VENDOR_ID_INTEL, 0x1209, PCI_ANY_ID, PCI_ANY_ID, }, 2343 { PCI_VENDOR_ID_INTEL, 0x1209, PCI_ANY_ID, PCI_ANY_ID, },
@@ -2368,7 +2368,7 @@ static struct pci_device_id eepro100_pci_tbl[] = {
2368 { 0,} 2368 { 0,}
2369}; 2369};
2370MODULE_DEVICE_TABLE(pci, eepro100_pci_tbl); 2370MODULE_DEVICE_TABLE(pci, eepro100_pci_tbl);
2371 2371
2372static struct pci_driver eepro100_driver = { 2372static struct pci_driver eepro100_driver = {
2373 .name = "eepro100", 2373 .name = "eepro100",
2374 .id_table = eepro100_pci_tbl, 2374 .id_table = eepro100_pci_tbl,
@@ -2395,7 +2395,7 @@ static void __exit eepro100_cleanup_module(void)
2395 2395
2396module_init(eepro100_init_module); 2396module_init(eepro100_init_module);
2397module_exit(eepro100_cleanup_module); 2397module_exit(eepro100_cleanup_module);
2398 2398
2399/* 2399/*
2400 * Local variables: 2400 * Local variables:
2401 * compile-command: "gcc -DMODULE -D__KERNEL__ -I/usr/src/linux/net/inet -Wall -Wstrict-prototypes -O6 -c eepro100.c `[ -f /usr/include/linux/modversions.h ] && echo -DMODVERSIONS`" 2401 * compile-command: "gcc -DMODULE -D__KERNEL__ -I/usr/src/linux/net/inet -Wall -Wstrict-prototypes -O6 -c eepro100.c `[ -f /usr/include/linux/modversions.h ] && echo -DMODVERSIONS`"