diff options
author | Jeff Garzik <jeff@garzik.org> | 2006-09-13 13:24:59 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-09-13 13:24:59 -0400 |
commit | 6aa20a2235535605db6d6d2bd850298b2fe7f31e (patch) | |
tree | df0b855043407b831d57f2f2c271f8aab48444f4 /drivers/net/yellowfin.c | |
parent | 7a291083225af6e22ffaa46b3d91cfc1a1ccaab4 (diff) |
drivers/net: Trim trailing whitespace
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/yellowfin.c')
-rw-r--r-- | drivers/net/yellowfin.c | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c index 8746cc7c7088..de11246b99ee 100644 --- a/drivers/net/yellowfin.c +++ b/drivers/net/yellowfin.c | |||
@@ -137,7 +137,7 @@ MODULE_PARM_DESC(gx_fix, "G-NIC: enable GX server chipset bug workaround (0-1)") | |||
137 | I. Board Compatibility | 137 | I. Board Compatibility |
138 | 138 | ||
139 | This device driver is designed for the Packet Engines "Yellowfin" Gigabit | 139 | This device driver is designed for the Packet Engines "Yellowfin" Gigabit |
140 | Ethernet adapter. The G-NIC 64-bit PCI card is supported, as well as the | 140 | Ethernet adapter. The G-NIC 64-bit PCI card is supported, as well as the |
141 | Symbios 53C885E dual function chip. | 141 | Symbios 53C885E dual function chip. |
142 | 142 | ||
143 | II. Board-specific settings | 143 | II. Board-specific settings |
@@ -208,7 +208,7 @@ IVc. Errata | |||
208 | See Packet Engines confidential appendix (prototype chips only). | 208 | See Packet Engines confidential appendix (prototype chips only). |
209 | */ | 209 | */ |
210 | 210 | ||
211 | 211 | ||
212 | 212 | ||
213 | enum capability_flags { | 213 | enum capability_flags { |
214 | HasMII=1, FullTxStatus=2, IsGigabit=4, HasMulticastBug=8, FullRxStatus=16, | 214 | HasMII=1, FullTxStatus=2, IsGigabit=4, HasMulticastBug=8, FullRxStatus=16, |
@@ -377,7 +377,7 @@ static int __devinit yellowfin_init_one(struct pci_dev *pdev, | |||
377 | #else | 377 | #else |
378 | int bar = 1; | 378 | int bar = 1; |
379 | #endif | 379 | #endif |
380 | 380 | ||
381 | /* when built into the kernel, we only print version if device is found */ | 381 | /* when built into the kernel, we only print version if device is found */ |
382 | #ifndef MODULE | 382 | #ifndef MODULE |
383 | static int printed_version; | 383 | static int printed_version; |
@@ -508,11 +508,11 @@ static int __devinit yellowfin_init_one(struct pci_dev *pdev, | |||
508 | } | 508 | } |
509 | 509 | ||
510 | find_cnt++; | 510 | find_cnt++; |
511 | 511 | ||
512 | return 0; | 512 | return 0; |
513 | 513 | ||
514 | err_out_unmap_status: | 514 | err_out_unmap_status: |
515 | pci_free_consistent(pdev, STATUS_TOTAL_SIZE, np->tx_status, | 515 | pci_free_consistent(pdev, STATUS_TOTAL_SIZE, np->tx_status, |
516 | np->tx_status_dma); | 516 | np->tx_status_dma); |
517 | err_out_unmap_rx: | 517 | err_out_unmap_rx: |
518 | pci_free_consistent(pdev, RX_TOTAL_SIZE, np->rx_ring, np->rx_ring_dma); | 518 | pci_free_consistent(pdev, RX_TOTAL_SIZE, np->rx_ring, np->rx_ring_dma); |
@@ -569,7 +569,7 @@ static void mdio_write(void __iomem *ioaddr, int phy_id, int location, int value | |||
569 | return; | 569 | return; |
570 | } | 570 | } |
571 | 571 | ||
572 | 572 | ||
573 | static int yellowfin_open(struct net_device *dev) | 573 | static int yellowfin_open(struct net_device *dev) |
574 | { | 574 | { |
575 | struct yellowfin_private *yp = netdev_priv(dev); | 575 | struct yellowfin_private *yp = netdev_priv(dev); |
@@ -673,7 +673,7 @@ static void yellowfin_timer(unsigned long data) | |||
673 | dev->name, yp->phys[0], bmsr, lpa); | 673 | dev->name, yp->phys[0], bmsr, lpa); |
674 | 674 | ||
675 | yp->full_duplex = mii_duplex(yp->duplex_lock, negotiated); | 675 | yp->full_duplex = mii_duplex(yp->duplex_lock, negotiated); |
676 | 676 | ||
677 | iowrite16(0x101C | (yp->full_duplex ? 2 : 0), ioaddr + Cnfg); | 677 | iowrite16(0x101C | (yp->full_duplex ? 2 : 0), ioaddr + Cnfg); |
678 | 678 | ||
679 | if (bmsr & BMSR_LSTATUS) | 679 | if (bmsr & BMSR_LSTATUS) |
@@ -792,10 +792,10 @@ static void yellowfin_init_ring(struct net_device *dev) | |||
792 | /* Om pade ummmmm... */ | 792 | /* Om pade ummmmm... */ |
793 | yp->tx_ring[j].addr = cpu_to_le32(yp->tx_status_dma + | 793 | yp->tx_ring[j].addr = cpu_to_le32(yp->tx_status_dma + |
794 | i*sizeof(struct tx_status_words) + | 794 | i*sizeof(struct tx_status_words) + |
795 | &(yp->tx_status[0].tx_errs) - | 795 | &(yp->tx_status[0].tx_errs) - |
796 | &(yp->tx_status[0])); | 796 | &(yp->tx_status[0])); |
797 | } | 797 | } |
798 | yp->tx_ring[j].branch_addr = cpu_to_le32(yp->tx_ring_dma + | 798 | yp->tx_ring[j].branch_addr = cpu_to_le32(yp->tx_ring_dma + |
799 | ((j+1)%(2*TX_RING_SIZE))*sizeof(struct yellowfin_desc)); | 799 | ((j+1)%(2*TX_RING_SIZE))*sizeof(struct yellowfin_desc)); |
800 | } | 800 | } |
801 | /* Wrap ring */ | 801 | /* Wrap ring */ |
@@ -835,7 +835,7 @@ static int yellowfin_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
835 | yp->tx_skbuff[entry] = skb; | 835 | yp->tx_skbuff[entry] = skb; |
836 | 836 | ||
837 | #ifdef NO_TXSTATS | 837 | #ifdef NO_TXSTATS |
838 | yp->tx_ring[entry].addr = cpu_to_le32(pci_map_single(yp->pci_dev, | 838 | yp->tx_ring[entry].addr = cpu_to_le32(pci_map_single(yp->pci_dev, |
839 | skb->data, len, PCI_DMA_TODEVICE)); | 839 | skb->data, len, PCI_DMA_TODEVICE)); |
840 | yp->tx_ring[entry].result_status = 0; | 840 | yp->tx_ring[entry].result_status = 0; |
841 | if (entry >= TX_RING_SIZE-1) { | 841 | if (entry >= TX_RING_SIZE-1) { |
@@ -851,9 +851,9 @@ static int yellowfin_start_xmit(struct sk_buff *skb, struct net_device *dev) | |||
851 | yp->cur_tx++; | 851 | yp->cur_tx++; |
852 | #else | 852 | #else |
853 | yp->tx_ring[entry<<1].request_cnt = len; | 853 | yp->tx_ring[entry<<1].request_cnt = len; |
854 | yp->tx_ring[entry<<1].addr = cpu_to_le32(pci_map_single(yp->pci_dev, | 854 | yp->tx_ring[entry<<1].addr = cpu_to_le32(pci_map_single(yp->pci_dev, |
855 | skb->data, len, PCI_DMA_TODEVICE)); | 855 | skb->data, len, PCI_DMA_TODEVICE)); |
856 | /* The input_last (status-write) command is constant, but we must | 856 | /* The input_last (status-write) command is constant, but we must |
857 | rewrite the subsequent 'stop' command. */ | 857 | rewrite the subsequent 'stop' command. */ |
858 | 858 | ||
859 | yp->cur_tx++; | 859 | yp->cur_tx++; |
@@ -905,7 +905,7 @@ static irqreturn_t yellowfin_interrupt(int irq, void *dev_instance, struct pt_re | |||
905 | 905 | ||
906 | yp = netdev_priv(dev); | 906 | yp = netdev_priv(dev); |
907 | ioaddr = yp->base; | 907 | ioaddr = yp->base; |
908 | 908 | ||
909 | spin_lock (&yp->lock); | 909 | spin_lock (&yp->lock); |
910 | 910 | ||
911 | do { | 911 | do { |
@@ -993,8 +993,8 @@ static irqreturn_t yellowfin_interrupt(int irq, void *dev_instance, struct pt_re | |||
993 | yp->stats.tx_packets++; | 993 | yp->stats.tx_packets++; |
994 | } | 994 | } |
995 | /* Free the original skb. */ | 995 | /* Free the original skb. */ |
996 | pci_unmap_single(yp->pci_dev, | 996 | pci_unmap_single(yp->pci_dev, |
997 | yp->tx_ring[entry<<1].addr, skb->len, | 997 | yp->tx_ring[entry<<1].addr, skb->len, |
998 | PCI_DMA_TODEVICE); | 998 | PCI_DMA_TODEVICE); |
999 | dev_kfree_skb_irq(skb); | 999 | dev_kfree_skb_irq(skb); |
1000 | yp->tx_skbuff[entry] = 0; | 1000 | yp->tx_skbuff[entry] = 0; |
@@ -1073,7 +1073,7 @@ static int yellowfin_rx(struct net_device *dev) | |||
1073 | yp->rx_buf_sz, PCI_DMA_FROMDEVICE); | 1073 | yp->rx_buf_sz, PCI_DMA_FROMDEVICE); |
1074 | desc_status = le32_to_cpu(desc->result_status) >> 16; | 1074 | desc_status = le32_to_cpu(desc->result_status) >> 16; |
1075 | buf_addr = rx_skb->data; | 1075 | buf_addr = rx_skb->data; |
1076 | data_size = (le32_to_cpu(desc->dbdma_cmd) - | 1076 | data_size = (le32_to_cpu(desc->dbdma_cmd) - |
1077 | le32_to_cpu(desc->result_status)) & 0xffff; | 1077 | le32_to_cpu(desc->result_status)) & 0xffff; |
1078 | frame_status = le16_to_cpu(get_unaligned((s16*)&(buf_addr[data_size - 2]))); | 1078 | frame_status = le16_to_cpu(get_unaligned((s16*)&(buf_addr[data_size - 2]))); |
1079 | if (yellowfin_debug > 4) | 1079 | if (yellowfin_debug > 4) |
@@ -1109,7 +1109,7 @@ static int yellowfin_rx(struct net_device *dev) | |||
1109 | } else if ((yp->flags & HasMACAddrBug) && | 1109 | } else if ((yp->flags & HasMACAddrBug) && |
1110 | memcmp(le32_to_cpu(yp->rx_ring_dma + | 1110 | memcmp(le32_to_cpu(yp->rx_ring_dma + |
1111 | entry*sizeof(struct yellowfin_desc)), | 1111 | entry*sizeof(struct yellowfin_desc)), |
1112 | dev->dev_addr, 6) != 0 && | 1112 | dev->dev_addr, 6) != 0 && |
1113 | memcmp(le32_to_cpu(yp->rx_ring_dma + | 1113 | memcmp(le32_to_cpu(yp->rx_ring_dma + |
1114 | entry*sizeof(struct yellowfin_desc)), | 1114 | entry*sizeof(struct yellowfin_desc)), |
1115 | "\377\377\377\377\377\377", 6) != 0) { | 1115 | "\377\377\377\377\377\377", 6) != 0) { |
@@ -1135,9 +1135,9 @@ static int yellowfin_rx(struct net_device *dev) | |||
1135 | without copying to a properly sized skbuff. */ | 1135 | without copying to a properly sized skbuff. */ |
1136 | if (pkt_len > rx_copybreak) { | 1136 | if (pkt_len > rx_copybreak) { |
1137 | skb_put(skb = rx_skb, pkt_len); | 1137 | skb_put(skb = rx_skb, pkt_len); |
1138 | pci_unmap_single(yp->pci_dev, | 1138 | pci_unmap_single(yp->pci_dev, |
1139 | yp->rx_ring[entry].addr, | 1139 | yp->rx_ring[entry].addr, |
1140 | yp->rx_buf_sz, | 1140 | yp->rx_buf_sz, |
1141 | PCI_DMA_FROMDEVICE); | 1141 | PCI_DMA_FROMDEVICE); |
1142 | yp->rx_skbuff[entry] = NULL; | 1142 | yp->rx_skbuff[entry] = NULL; |
1143 | } else { | 1143 | } else { |
@@ -1403,7 +1403,7 @@ static void __devexit yellowfin_remove_one (struct pci_dev *pdev) | |||
1403 | BUG_ON(!dev); | 1403 | BUG_ON(!dev); |
1404 | np = netdev_priv(dev); | 1404 | np = netdev_priv(dev); |
1405 | 1405 | ||
1406 | pci_free_consistent(pdev, STATUS_TOTAL_SIZE, np->tx_status, | 1406 | pci_free_consistent(pdev, STATUS_TOTAL_SIZE, np->tx_status, |
1407 | np->tx_status_dma); | 1407 | np->tx_status_dma); |
1408 | pci_free_consistent(pdev, RX_TOTAL_SIZE, np->rx_ring, np->rx_ring_dma); | 1408 | pci_free_consistent(pdev, RX_TOTAL_SIZE, np->rx_ring, np->rx_ring_dma); |
1409 | pci_free_consistent(pdev, TX_TOTAL_SIZE, np->tx_ring, np->tx_ring_dma); | 1409 | pci_free_consistent(pdev, TX_TOTAL_SIZE, np->tx_ring, np->tx_ring_dma); |
@@ -1444,7 +1444,7 @@ static void __exit yellowfin_cleanup (void) | |||
1444 | 1444 | ||
1445 | module_init(yellowfin_init); | 1445 | module_init(yellowfin_init); |
1446 | module_exit(yellowfin_cleanup); | 1446 | module_exit(yellowfin_cleanup); |
1447 | 1447 | ||
1448 | /* | 1448 | /* |
1449 | * Local variables: | 1449 | * Local variables: |
1450 | * compile-command: "gcc -DMODULE -Wall -Wstrict-prototypes -O6 -c yellowfin.c" | 1450 | * compile-command: "gcc -DMODULE -Wall -Wstrict-prototypes -O6 -c yellowfin.c" |