aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/3c59x.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/3c59x.c
parent7a291083225af6e22ffaa46b3d91cfc1a1ccaab4 (diff)
drivers/net: Trim trailing whitespace
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/3c59x.c')
-rw-r--r--drivers/net/3c59x.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/drivers/net/3c59x.c b/drivers/net/3c59x.c
index 415d08113e10..5ca7a563f0ba 100644
--- a/drivers/net/3c59x.c
+++ b/drivers/net/3c59x.c
@@ -796,7 +796,7 @@ static void poll_vortex(struct net_device *dev)
796 local_irq_disable(); 796 local_irq_disable();
797 (vp->full_bus_master_rx ? boomerang_interrupt:vortex_interrupt)(dev->irq,dev,NULL); 797 (vp->full_bus_master_rx ? boomerang_interrupt:vortex_interrupt)(dev->irq,dev,NULL);
798 local_irq_restore(flags); 798 local_irq_restore(flags);
799} 799}
800#endif 800#endif
801 801
802#ifdef CONFIG_PM 802#ifdef CONFIG_PM
@@ -904,7 +904,7 @@ static int vortex_eisa_remove(struct device *device)
904 904
905 vp = netdev_priv(dev); 905 vp = netdev_priv(dev);
906 ioaddr = vp->ioaddr; 906 ioaddr = vp->ioaddr;
907 907
908 unregister_netdev(dev); 908 unregister_netdev(dev);
909 iowrite16(TotalReset|0x14, ioaddr + EL3_CMD); 909 iowrite16(TotalReset|0x14, ioaddr + EL3_CMD);
910 release_region(dev->base_addr, VORTEX_TOTAL_SIZE); 910 release_region(dev->base_addr, VORTEX_TOTAL_SIZE);
@@ -935,7 +935,7 @@ static int __init vortex_eisa_init(void)
935 eisa_found = 1; 935 eisa_found = 1;
936 } 936 }
937#endif 937#endif
938 938
939 /* Special code to work-around the Compaq PCI BIOS32 problem. */ 939 /* Special code to work-around the Compaq PCI BIOS32 problem. */
940 if (compaq_ioaddr) { 940 if (compaq_ioaddr) {
941 vortex_probe1(NULL, ioport_map(compaq_ioaddr, VORTEX_TOTAL_SIZE), 941 vortex_probe1(NULL, ioport_map(compaq_ioaddr, VORTEX_TOTAL_SIZE),
@@ -953,7 +953,7 @@ static int __devinit vortex_init_one(struct pci_dev *pdev,
953 struct vortex_chip_info *vci; 953 struct vortex_chip_info *vci;
954 void __iomem *ioaddr; 954 void __iomem *ioaddr;
955 955
956 /* wake up and enable device */ 956 /* wake up and enable device */
957 rc = pci_enable_device(pdev); 957 rc = pci_enable_device(pdev);
958 if (rc < 0) 958 if (rc < 0)
959 goto out; 959 goto out;
@@ -1089,7 +1089,7 @@ static int __devinit vortex_probe1(struct device *gendev,
1089 if (request_region(dev->base_addr, vci->io_size, print_name) != NULL) 1089 if (request_region(dev->base_addr, vci->io_size, print_name) != NULL)
1090 vp->must_free_region = 1; 1090 vp->must_free_region = 1;
1091 1091
1092 /* enable bus-mastering if necessary */ 1092 /* enable bus-mastering if necessary */
1093 if (vci->flags & PCI_USES_MASTER) 1093 if (vci->flags & PCI_USES_MASTER)
1094 pci_set_master(pdev); 1094 pci_set_master(pdev);
1095 1095
@@ -1131,7 +1131,7 @@ static int __devinit vortex_probe1(struct device *gendev,
1131 vp->tx_ring_dma = vp->rx_ring_dma + sizeof(struct boom_rx_desc) * RX_RING_SIZE; 1131 vp->tx_ring_dma = vp->rx_ring_dma + sizeof(struct boom_rx_desc) * RX_RING_SIZE;
1132 1132
1133 /* if we are a PCI driver, we store info in pdev->driver_data 1133 /* if we are a PCI driver, we store info in pdev->driver_data
1134 * instead of a module list */ 1134 * instead of a module list */
1135 if (pdev) 1135 if (pdev)
1136 pci_set_drvdata(pdev, dev); 1136 pci_set_drvdata(pdev, dev);
1137 if (edev) 1137 if (edev)
@@ -1393,7 +1393,7 @@ static int __devinit vortex_probe1(struct device *gendev,
1393 dev->tx_timeout = vortex_tx_timeout; 1393 dev->tx_timeout = vortex_tx_timeout;
1394 dev->watchdog_timeo = (watchdog * HZ) / 1000; 1394 dev->watchdog_timeo = (watchdog * HZ) / 1000;
1395#ifdef CONFIG_NET_POLL_CONTROLLER 1395#ifdef CONFIG_NET_POLL_CONTROLLER
1396 dev->poll_controller = poll_vortex; 1396 dev->poll_controller = poll_vortex;
1397#endif 1397#endif
1398 if (pdev) { 1398 if (pdev) {
1399 vp->pm_state_valid = 1; 1399 vp->pm_state_valid = 1;
@@ -1875,11 +1875,11 @@ static void vortex_tx_timeout(struct net_device *dev)
1875 vp->stats.tx_dropped++; 1875 vp->stats.tx_dropped++;
1876 netif_wake_queue(dev); 1876 netif_wake_queue(dev);
1877 } 1877 }
1878 1878
1879 /* Issue Tx Enable */ 1879 /* Issue Tx Enable */
1880 iowrite16(TxEnable, ioaddr + EL3_CMD); 1880 iowrite16(TxEnable, ioaddr + EL3_CMD);
1881 dev->trans_start = jiffies; 1881 dev->trans_start = jiffies;
1882 1882
1883 /* Switch to register set 7 for normal use. */ 1883 /* Switch to register set 7 for normal use. */
1884 EL3WINDOW(7); 1884 EL3WINDOW(7);
1885} 1885}
@@ -2316,10 +2316,10 @@ boomerang_interrupt(int irq, void *dev_id, struct pt_regs *regs)
2316 if ((vp->tx_ring[entry].status & DN_COMPLETE) == 0) 2316 if ((vp->tx_ring[entry].status & DN_COMPLETE) == 0)
2317 break; /* It still hasn't been processed. */ 2317 break; /* It still hasn't been processed. */
2318#endif 2318#endif
2319 2319
2320 if (vp->tx_skbuff[entry]) { 2320 if (vp->tx_skbuff[entry]) {
2321 struct sk_buff *skb = vp->tx_skbuff[entry]; 2321 struct sk_buff *skb = vp->tx_skbuff[entry];
2322#if DO_ZEROCOPY 2322#if DO_ZEROCOPY
2323 int i; 2323 int i;
2324 for (i=0; i<=skb_shinfo(skb)->nr_frags; i++) 2324 for (i=0; i<=skb_shinfo(skb)->nr_frags; i++)
2325 pci_unmap_single(VORTEX_PCI(vp), 2325 pci_unmap_single(VORTEX_PCI(vp),
@@ -2633,7 +2633,7 @@ vortex_close(struct net_device *dev)
2633 "not using them!\n", dev->name); 2633 "not using them!\n", dev->name);
2634 } 2634 }
2635#endif 2635#endif
2636 2636
2637 free_irq(dev->irq, dev); 2637 free_irq(dev->irq, dev);
2638 2638
2639 if (vp->full_bus_master_rx) { /* Free Boomerang bus master Rx buffers. */ 2639 if (vp->full_bus_master_rx) { /* Free Boomerang bus master Rx buffers. */
@@ -2675,7 +2675,7 @@ dump_tx_ring(struct net_device *dev)
2675 if (vortex_debug > 0) { 2675 if (vortex_debug > 0) {
2676 struct vortex_private *vp = netdev_priv(dev); 2676 struct vortex_private *vp = netdev_priv(dev);
2677 void __iomem *ioaddr = vp->ioaddr; 2677 void __iomem *ioaddr = vp->ioaddr;
2678 2678
2679 if (vp->full_bus_master_tx) { 2679 if (vp->full_bus_master_tx) {
2680 int i; 2680 int i;
2681 int stalled = ioread32(ioaddr + PktStatus) & 0x04; /* Possible racy. But it's only debug stuff */ 2681 int stalled = ioread32(ioaddr + PktStatus) & 0x04; /* Possible racy. But it's only debug stuff */
@@ -3190,7 +3190,7 @@ static void __exit vortex_eisa_cleanup(void)
3190 /* Take care of the EISA devices */ 3190 /* Take care of the EISA devices */
3191 eisa_driver_unregister(&vortex_eisa_driver); 3191 eisa_driver_unregister(&vortex_eisa_driver);
3192#endif 3192#endif
3193 3193
3194 if (compaq_net_device) { 3194 if (compaq_net_device) {
3195 vp = compaq_net_device->priv; 3195 vp = compaq_net_device->priv;
3196 ioaddr = ioport_map(compaq_net_device->base_addr, 3196 ioaddr = ioport_map(compaq_net_device->base_addr,