diff options
author | Jeff Garzik <jeff@garzik.org> | 2008-05-13 01:41:58 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@redhat.com> | 2008-05-13 01:41:58 -0400 |
commit | 7d2e3cb7000b883a8e489485ac249be572fe17b1 (patch) | |
tree | 91bb398cc72e37e5a515b39ca5ade0ac53972b6c /drivers/net | |
parent | 3f8cb098859bbea29d7b3765a3102e4a6bf81b85 (diff) |
[netdrvr] Trim trailing whitespace for several drivers
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
Diffstat (limited to 'drivers/net')
-rw-r--r-- | drivers/net/cpmac.c | 2 | ||||
-rw-r--r-- | drivers/net/dm9000.c | 6 | ||||
-rw-r--r-- | drivers/net/gianfar.c | 2 | ||||
-rw-r--r-- | drivers/net/natsemi.c | 4 | ||||
-rw-r--r-- | drivers/net/niu.h | 2 | ||||
-rw-r--r-- | drivers/net/pcnet32.c | 6 | ||||
-rw-r--r-- | drivers/net/qla3xxx.c | 4 | ||||
-rw-r--r-- | drivers/net/s2io.c | 4 | ||||
-rw-r--r-- | drivers/net/s2io.h | 2 | ||||
-rw-r--r-- | drivers/net/sb1250-mac.c | 2 | ||||
-rw-r--r-- | drivers/net/sis190.c | 2 | ||||
-rw-r--r-- | drivers/net/sis900.c | 2 | ||||
-rw-r--r-- | drivers/net/sky2.c | 2 | ||||
-rw-r--r-- | drivers/net/spider_net.c | 4 | ||||
-rw-r--r-- | drivers/net/tsi108_eth.c | 4 | ||||
-rw-r--r-- | drivers/net/ucc_geth_ethtool.c | 4 |
16 files changed, 26 insertions, 26 deletions
diff --git a/drivers/net/cpmac.c b/drivers/net/cpmac.c index 2b5740b3d182..ae07100bb935 100644 --- a/drivers/net/cpmac.c +++ b/drivers/net/cpmac.c | |||
@@ -708,7 +708,7 @@ static void cpmac_tx_timeout(struct net_device *dev) | |||
708 | spin_unlock(&priv->lock); | 708 | spin_unlock(&priv->lock); |
709 | if (netif_msg_tx_err(priv) && net_ratelimit()) | 709 | if (netif_msg_tx_err(priv) && net_ratelimit()) |
710 | printk(KERN_WARNING "%s: transmit timeout\n", dev->name); | 710 | printk(KERN_WARNING "%s: transmit timeout\n", dev->name); |
711 | /* | 711 | /* |
712 | * FIXME: waking up random queue is not the best thing to | 712 | * FIXME: waking up random queue is not the best thing to |
713 | * do... on the other hand why we got here at all? | 713 | * do... on the other hand why we got here at all? |
714 | */ | 714 | */ |
diff --git a/drivers/net/dm9000.c b/drivers/net/dm9000.c index e6fe2614ea6d..12b4626102e1 100644 --- a/drivers/net/dm9000.c +++ b/drivers/net/dm9000.c | |||
@@ -696,7 +696,7 @@ dm9000_probe(struct platform_device *pdev) | |||
696 | 696 | ||
697 | if (!is_valid_ether_addr(ndev->dev_addr)) { | 697 | if (!is_valid_ether_addr(ndev->dev_addr)) { |
698 | /* try reading from mac */ | 698 | /* try reading from mac */ |
699 | 699 | ||
700 | mac_src = "chip"; | 700 | mac_src = "chip"; |
701 | for (i = 0; i < 6; i++) | 701 | for (i = 0; i < 6; i++) |
702 | ndev->dev_addr[i] = ior(db, i+DM9000_PAR); | 702 | ndev->dev_addr[i] = ior(db, i+DM9000_PAR); |
@@ -746,7 +746,7 @@ dm9000_open(struct net_device *dev) | |||
746 | dev_warn(db->dev, "WARNING: no IRQ resource flags set.\n"); | 746 | dev_warn(db->dev, "WARNING: no IRQ resource flags set.\n"); |
747 | irqflags = DEFAULT_TRIGGER; | 747 | irqflags = DEFAULT_TRIGGER; |
748 | } | 748 | } |
749 | 749 | ||
750 | irqflags |= IRQF_SHARED; | 750 | irqflags |= IRQF_SHARED; |
751 | 751 | ||
752 | if (request_irq(dev->irq, &dm9000_interrupt, irqflags, dev->name, dev)) | 752 | if (request_irq(dev->irq, &dm9000_interrupt, irqflags, dev->name, dev)) |
@@ -1089,7 +1089,7 @@ static int dm9000_wait_eeprom(board_info_t *db) | |||
1089 | /* The DM9000 data sheets say we should be able to | 1089 | /* The DM9000 data sheets say we should be able to |
1090 | * poll the ERRE bit in EPCR to wait for the EEPROM | 1090 | * poll the ERRE bit in EPCR to wait for the EEPROM |
1091 | * operation. From testing several chips, this bit | 1091 | * operation. From testing several chips, this bit |
1092 | * does not seem to work. | 1092 | * does not seem to work. |
1093 | * | 1093 | * |
1094 | * We attempt to use the bit, but fall back to the | 1094 | * We attempt to use the bit, but fall back to the |
1095 | * timeout (which is why we do not return an error | 1095 | * timeout (which is why we do not return an error |
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c index 587afe7be689..642dc633b444 100644 --- a/drivers/net/gianfar.c +++ b/drivers/net/gianfar.c | |||
@@ -925,7 +925,7 @@ rx_irq_fail: | |||
925 | tx_irq_fail: | 925 | tx_irq_fail: |
926 | free_irq(priv->interruptError, dev); | 926 | free_irq(priv->interruptError, dev); |
927 | err_irq_fail: | 927 | err_irq_fail: |
928 | err_rxalloc_fail: | 928 | err_rxalloc_fail: |
929 | rx_skb_fail: | 929 | rx_skb_fail: |
930 | free_skb_resources(priv); | 930 | free_skb_resources(priv); |
931 | tx_skb_fail: | 931 | tx_skb_fail: |
diff --git a/drivers/net/natsemi.c b/drivers/net/natsemi.c index 46119bb3770a..b238ed0e8ace 100644 --- a/drivers/net/natsemi.c +++ b/drivers/net/natsemi.c | |||
@@ -664,7 +664,7 @@ static ssize_t natsemi_show_##_name(struct device *dev, \ | |||
664 | NATSEMI_ATTR(dspcfg_workaround); | 664 | NATSEMI_ATTR(dspcfg_workaround); |
665 | 665 | ||
666 | static ssize_t natsemi_show_dspcfg_workaround(struct device *dev, | 666 | static ssize_t natsemi_show_dspcfg_workaround(struct device *dev, |
667 | struct device_attribute *attr, | 667 | struct device_attribute *attr, |
668 | char *buf) | 668 | char *buf) |
669 | { | 669 | { |
670 | struct netdev_private *np = netdev_priv(to_net_dev(dev)); | 670 | struct netdev_private *np = netdev_priv(to_net_dev(dev)); |
@@ -687,7 +687,7 @@ static ssize_t natsemi_set_dspcfg_workaround(struct device *dev, | |||
687 | || !strncmp("0", buf, count - 1)) | 687 | || !strncmp("0", buf, count - 1)) |
688 | new_setting = 0; | 688 | new_setting = 0; |
689 | else | 689 | else |
690 | return count; | 690 | return count; |
691 | 691 | ||
692 | spin_lock_irqsave(&np->lock, flags); | 692 | spin_lock_irqsave(&np->lock, flags); |
693 | 693 | ||
diff --git a/drivers/net/niu.h b/drivers/net/niu.h index 97ffbe137bcb..101a3f1a8ec8 100644 --- a/drivers/net/niu.h +++ b/drivers/net/niu.h | |||
@@ -281,7 +281,7 @@ | |||
281 | #define XMAC_ADDR1 0x000a8UL | 281 | #define XMAC_ADDR1 0x000a8UL |
282 | #define XMAC_ADDR1_ADDR1 0x000000000000ffffULL | 282 | #define XMAC_ADDR1_ADDR1 0x000000000000ffffULL |
283 | 283 | ||
284 | #define XMAC_ADDR2 0x000b0UL | 284 | #define XMAC_ADDR2 0x000b0UL |
285 | #define XMAC_ADDR2_ADDR2 0x000000000000ffffULL | 285 | #define XMAC_ADDR2_ADDR2 0x000000000000ffffULL |
286 | 286 | ||
287 | #define XMAC_ADDR_CMPEN 0x00208UL | 287 | #define XMAC_ADDR_CMPEN 0x00208UL |
diff --git a/drivers/net/pcnet32.c b/drivers/net/pcnet32.c index 4eb322e5273d..d0d5585114b0 100644 --- a/drivers/net/pcnet32.c +++ b/drivers/net/pcnet32.c | |||
@@ -2006,7 +2006,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) | |||
2006 | err_free_ring: | 2006 | err_free_ring: |
2007 | pcnet32_free_ring(dev); | 2007 | pcnet32_free_ring(dev); |
2008 | err_free_consistent: | 2008 | err_free_consistent: |
2009 | pci_free_consistent(lp->pci_dev, sizeof(*lp->init_block), | 2009 | pci_free_consistent(lp->pci_dev, sizeof(*lp->init_block), |
2010 | lp->init_block, lp->init_dma_addr); | 2010 | lp->init_block, lp->init_dma_addr); |
2011 | err_free_netdev: | 2011 | err_free_netdev: |
2012 | free_netdev(dev); | 2012 | free_netdev(dev); |
@@ -3006,7 +3006,7 @@ static void __devexit pcnet32_remove_one(struct pci_dev *pdev) | |||
3006 | unregister_netdev(dev); | 3006 | unregister_netdev(dev); |
3007 | pcnet32_free_ring(dev); | 3007 | pcnet32_free_ring(dev); |
3008 | release_region(dev->base_addr, PCNET32_TOTAL_SIZE); | 3008 | release_region(dev->base_addr, PCNET32_TOTAL_SIZE); |
3009 | pci_free_consistent(lp->pci_dev, sizeof(*lp->init_block), | 3009 | pci_free_consistent(lp->pci_dev, sizeof(*lp->init_block), |
3010 | lp->init_block, lp->init_dma_addr); | 3010 | lp->init_block, lp->init_dma_addr); |
3011 | free_netdev(dev); | 3011 | free_netdev(dev); |
3012 | pci_disable_device(pdev); | 3012 | pci_disable_device(pdev); |
@@ -3089,7 +3089,7 @@ static void __exit pcnet32_cleanup_module(void) | |||
3089 | unregister_netdev(pcnet32_dev); | 3089 | unregister_netdev(pcnet32_dev); |
3090 | pcnet32_free_ring(pcnet32_dev); | 3090 | pcnet32_free_ring(pcnet32_dev); |
3091 | release_region(pcnet32_dev->base_addr, PCNET32_TOTAL_SIZE); | 3091 | release_region(pcnet32_dev->base_addr, PCNET32_TOTAL_SIZE); |
3092 | pci_free_consistent(lp->pci_dev, sizeof(*lp->init_block), | 3092 | pci_free_consistent(lp->pci_dev, sizeof(*lp->init_block), |
3093 | lp->init_block, lp->init_dma_addr); | 3093 | lp->init_block, lp->init_dma_addr); |
3094 | free_netdev(pcnet32_dev); | 3094 | free_netdev(pcnet32_dev); |
3095 | pcnet32_dev = next_dev; | 3095 | pcnet32_dev = next_dev; |
diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c index b7f7b2227d56..5f608780c3e8 100644 --- a/drivers/net/qla3xxx.c +++ b/drivers/net/qla3xxx.c | |||
@@ -1437,9 +1437,9 @@ static void ql_phy_start_neg_ex(struct ql3_adapter *qdev) | |||
1437 | reg &= ~PHY_GIG_ALL_PARAMS; | 1437 | reg &= ~PHY_GIG_ALL_PARAMS; |
1438 | 1438 | ||
1439 | if(portConfiguration & PORT_CONFIG_1000MB_SPEED) { | 1439 | if(portConfiguration & PORT_CONFIG_1000MB_SPEED) { |
1440 | if(portConfiguration & PORT_CONFIG_FULL_DUPLEX_ENABLED) | 1440 | if(portConfiguration & PORT_CONFIG_FULL_DUPLEX_ENABLED) |
1441 | reg |= PHY_GIG_ADV_1000F; | 1441 | reg |= PHY_GIG_ADV_1000F; |
1442 | else | 1442 | else |
1443 | reg |= PHY_GIG_ADV_1000H; | 1443 | reg |= PHY_GIG_ADV_1000H; |
1444 | } | 1444 | } |
1445 | 1445 | ||
diff --git a/drivers/net/s2io.c b/drivers/net/s2io.c index 523478ebfd69..75bde6475832 100644 --- a/drivers/net/s2io.c +++ b/drivers/net/s2io.c | |||
@@ -2547,7 +2547,7 @@ static int fill_rx_buffers(struct ring_info *ring) | |||
2547 | if (block_no) | 2547 | if (block_no) |
2548 | rxd_index += (block_no * ring->rxd_count); | 2548 | rxd_index += (block_no * ring->rxd_count); |
2549 | 2549 | ||
2550 | if ((block_no == block_no1) && | 2550 | if ((block_no == block_no1) && |
2551 | (off == ring->rx_curr_get_info.offset) && | 2551 | (off == ring->rx_curr_get_info.offset) && |
2552 | (rxdp->Host_Control)) { | 2552 | (rxdp->Host_Control)) { |
2553 | DBG_PRINT(INTR_DBG, "%s: Get and Put", | 2553 | DBG_PRINT(INTR_DBG, "%s: Get and Put", |
@@ -2593,7 +2593,7 @@ static int fill_rx_buffers(struct ring_info *ring) | |||
2593 | first_rxdp->Control_1 |= RXD_OWN_XENA; | 2593 | first_rxdp->Control_1 |= RXD_OWN_XENA; |
2594 | } | 2594 | } |
2595 | stats->mem_alloc_fail_cnt++; | 2595 | stats->mem_alloc_fail_cnt++; |
2596 | 2596 | ||
2597 | return -ENOMEM ; | 2597 | return -ENOMEM ; |
2598 | } | 2598 | } |
2599 | stats->mem_allocated += skb->truesize; | 2599 | stats->mem_allocated += skb->truesize; |
diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h index 0709ebae9139..58229dcbf5ec 100644 --- a/drivers/net/s2io.h +++ b/drivers/net/s2io.h | |||
@@ -747,7 +747,7 @@ struct ring_info { | |||
747 | 747 | ||
748 | /* interface MTU value */ | 748 | /* interface MTU value */ |
749 | unsigned mtu; | 749 | unsigned mtu; |
750 | 750 | ||
751 | /* Buffer Address store. */ | 751 | /* Buffer Address store. */ |
752 | struct buffAdd **ba; | 752 | struct buffAdd **ba; |
753 | 753 | ||
diff --git a/drivers/net/sb1250-mac.c b/drivers/net/sb1250-mac.c index 888b7dec9866..295199025173 100644 --- a/drivers/net/sb1250-mac.c +++ b/drivers/net/sb1250-mac.c | |||
@@ -1063,7 +1063,7 @@ static void sbmac_netpoll(struct net_device *netdev) | |||
1063 | ((M_MAC_INT_EOP_COUNT | M_MAC_INT_EOP_TIMER) << S_MAC_RX_CH0), | 1063 | ((M_MAC_INT_EOP_COUNT | M_MAC_INT_EOP_TIMER) << S_MAC_RX_CH0), |
1064 | sc->sbm_imr); | 1064 | sc->sbm_imr); |
1065 | #else | 1065 | #else |
1066 | __raw_writeq((M_MAC_INT_CHANNEL << S_MAC_TX_CH0) | | 1066 | __raw_writeq((M_MAC_INT_CHANNEL << S_MAC_TX_CH0) | |
1067 | (M_MAC_INT_CHANNEL << S_MAC_RX_CH0), sc->sbm_imr); | 1067 | (M_MAC_INT_CHANNEL << S_MAC_RX_CH0), sc->sbm_imr); |
1068 | #endif | 1068 | #endif |
1069 | } | 1069 | } |
diff --git a/drivers/net/sis190.c b/drivers/net/sis190.c index abc63b0663be..3fe01763760e 100644 --- a/drivers/net/sis190.c +++ b/drivers/net/sis190.c | |||
@@ -1656,7 +1656,7 @@ static inline void sis190_init_rxfilter(struct net_device *dev) | |||
1656 | SIS_PCI_COMMIT(); | 1656 | SIS_PCI_COMMIT(); |
1657 | } | 1657 | } |
1658 | 1658 | ||
1659 | static int __devinit sis190_get_mac_addr(struct pci_dev *pdev, | 1659 | static int __devinit sis190_get_mac_addr(struct pci_dev *pdev, |
1660 | struct net_device *dev) | 1660 | struct net_device *dev) |
1661 | { | 1661 | { |
1662 | int rc; | 1662 | int rc; |
diff --git a/drivers/net/sis900.c b/drivers/net/sis900.c index ec95e493ac1c..fa3a460f8e2f 100644 --- a/drivers/net/sis900.c +++ b/drivers/net/sis900.c | |||
@@ -1766,7 +1766,7 @@ static int sis900_rx(struct net_device *net_dev) | |||
1766 | skb = sis_priv->rx_skbuff[entry]; | 1766 | skb = sis_priv->rx_skbuff[entry]; |
1767 | net_dev->stats.rx_dropped++; | 1767 | net_dev->stats.rx_dropped++; |
1768 | goto refill_rx_ring; | 1768 | goto refill_rx_ring; |
1769 | } | 1769 | } |
1770 | 1770 | ||
1771 | /* This situation should never happen, but due to | 1771 | /* This situation should never happen, but due to |
1772 | some unknow bugs, it is possible that | 1772 | some unknow bugs, it is possible that |
diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c index f226bcac7d17..4b0f03358777 100644 --- a/drivers/net/sky2.c +++ b/drivers/net/sky2.c | |||
@@ -3369,7 +3369,7 @@ static void sky2_led(struct sky2_port *sky2, enum led_mode mode) | |||
3369 | 3369 | ||
3370 | gm_phy_write(hw, port, PHY_MARV_EXT_ADR, pg); | 3370 | gm_phy_write(hw, port, PHY_MARV_EXT_ADR, pg); |
3371 | } else | 3371 | } else |
3372 | gm_phy_write(hw, port, PHY_MARV_LED_OVER, | 3372 | gm_phy_write(hw, port, PHY_MARV_LED_OVER, |
3373 | PHY_M_LED_MO_DUP(mode) | | 3373 | PHY_M_LED_MO_DUP(mode) | |
3374 | PHY_M_LED_MO_10(mode) | | 3374 | PHY_M_LED_MO_10(mode) | |
3375 | PHY_M_LED_MO_100(mode) | | 3375 | PHY_M_LED_MO_100(mode) | |
diff --git a/drivers/net/spider_net.c b/drivers/net/spider_net.c index 477671606273..00aa0b108cb9 100644 --- a/drivers/net/spider_net.c +++ b/drivers/net/spider_net.c | |||
@@ -1704,7 +1704,7 @@ spider_net_poll_controller(struct net_device *netdev) | |||
1704 | * | 1704 | * |
1705 | * spider_net_enable_interrupt enables several interrupts | 1705 | * spider_net_enable_interrupt enables several interrupts |
1706 | */ | 1706 | */ |
1707 | static void | 1707 | static void |
1708 | spider_net_enable_interrupts(struct spider_net_card *card) | 1708 | spider_net_enable_interrupts(struct spider_net_card *card) |
1709 | { | 1709 | { |
1710 | spider_net_write_reg(card, SPIDER_NET_GHIINT0MSK, | 1710 | spider_net_write_reg(card, SPIDER_NET_GHIINT0MSK, |
@@ -1721,7 +1721,7 @@ spider_net_enable_interrupts(struct spider_net_card *card) | |||
1721 | * | 1721 | * |
1722 | * spider_net_disable_interrupts disables all the interrupts | 1722 | * spider_net_disable_interrupts disables all the interrupts |
1723 | */ | 1723 | */ |
1724 | static void | 1724 | static void |
1725 | spider_net_disable_interrupts(struct spider_net_card *card) | 1725 | spider_net_disable_interrupts(struct spider_net_card *card) |
1726 | { | 1726 | { |
1727 | spider_net_write_reg(card, SPIDER_NET_GHIINT0MSK, 0); | 1727 | spider_net_write_reg(card, SPIDER_NET_GHIINT0MSK, 0); |
diff --git a/drivers/net/tsi108_eth.c b/drivers/net/tsi108_eth.c index 6017d5267d08..c028facd9346 100644 --- a/drivers/net/tsi108_eth.c +++ b/drivers/net/tsi108_eth.c | |||
@@ -1526,7 +1526,7 @@ static int tsi108_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) | |||
1526 | struct tsi108_prv_data *data = netdev_priv(dev); | 1526 | struct tsi108_prv_data *data = netdev_priv(dev); |
1527 | unsigned long flags; | 1527 | unsigned long flags; |
1528 | int rc; | 1528 | int rc; |
1529 | 1529 | ||
1530 | spin_lock_irqsave(&data->txlock, flags); | 1530 | spin_lock_irqsave(&data->txlock, flags); |
1531 | rc = mii_ethtool_gset(&data->mii_if, cmd); | 1531 | rc = mii_ethtool_gset(&data->mii_if, cmd); |
1532 | spin_unlock_irqrestore(&data->txlock, flags); | 1532 | spin_unlock_irqrestore(&data->txlock, flags); |
@@ -1543,7 +1543,7 @@ static int tsi108_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) | |||
1543 | spin_lock_irqsave(&data->txlock, flags); | 1543 | spin_lock_irqsave(&data->txlock, flags); |
1544 | rc = mii_ethtool_sset(&data->mii_if, cmd); | 1544 | rc = mii_ethtool_sset(&data->mii_if, cmd); |
1545 | spin_unlock_irqrestore(&data->txlock, flags); | 1545 | spin_unlock_irqrestore(&data->txlock, flags); |
1546 | 1546 | ||
1547 | return rc; | 1547 | return rc; |
1548 | } | 1548 | } |
1549 | 1549 | ||
diff --git a/drivers/net/ucc_geth_ethtool.c b/drivers/net/ucc_geth_ethtool.c index 9a9622c13e2b..33200038a14d 100644 --- a/drivers/net/ucc_geth_ethtool.c +++ b/drivers/net/ucc_geth_ethtool.c | |||
@@ -5,7 +5,7 @@ | |||
5 | * | 5 | * |
6 | * Author: Li Yang <leoli@freescale.com> | 6 | * Author: Li Yang <leoli@freescale.com> |
7 | * | 7 | * |
8 | * Limitation: | 8 | * Limitation: |
9 | * Can only get/set setttings of the first queue. | 9 | * Can only get/set setttings of the first queue. |
10 | * Need to re-open the interface manually after changing some paramters. | 10 | * Need to re-open the interface manually after changing some paramters. |
11 | * | 11 | * |
@@ -165,7 +165,7 @@ uec_set_pauseparam(struct net_device *netdev, | |||
165 | 165 | ||
166 | ugeth->ug_info->receiveFlowControl = pause->rx_pause; | 166 | ugeth->ug_info->receiveFlowControl = pause->rx_pause; |
167 | ugeth->ug_info->transmitFlowControl = pause->tx_pause; | 167 | ugeth->ug_info->transmitFlowControl = pause->tx_pause; |
168 | 168 | ||
169 | if (ugeth->phydev->autoneg) { | 169 | if (ugeth->phydev->autoneg) { |
170 | if (netif_running(netdev)) { | 170 | if (netif_running(netdev)) { |
171 | /* FIXME: automatically restart */ | 171 | /* FIXME: automatically restart */ |