提交 7d2e3cb7 编写于 作者: J Jeff Garzik 提交者: Jeff Garzik

[netdrvr] Trim trailing whitespace for several drivers

Signed-off-by: NJeff Garzik <jgarzik@redhat.com>
上级 3f8cb098
...@@ -708,7 +708,7 @@ static void cpmac_tx_timeout(struct net_device *dev) ...@@ -708,7 +708,7 @@ static void cpmac_tx_timeout(struct net_device *dev)
spin_unlock(&priv->lock); spin_unlock(&priv->lock);
if (netif_msg_tx_err(priv) && net_ratelimit()) if (netif_msg_tx_err(priv) && net_ratelimit())
printk(KERN_WARNING "%s: transmit timeout\n", dev->name); printk(KERN_WARNING "%s: transmit timeout\n", dev->name);
/* /*
* FIXME: waking up random queue is not the best thing to * FIXME: waking up random queue is not the best thing to
* do... on the other hand why we got here at all? * do... on the other hand why we got here at all?
*/ */
......
...@@ -696,7 +696,7 @@ dm9000_probe(struct platform_device *pdev) ...@@ -696,7 +696,7 @@ dm9000_probe(struct platform_device *pdev)
if (!is_valid_ether_addr(ndev->dev_addr)) { if (!is_valid_ether_addr(ndev->dev_addr)) {
/* try reading from mac */ /* try reading from mac */
mac_src = "chip"; mac_src = "chip";
for (i = 0; i < 6; i++) for (i = 0; i < 6; i++)
ndev->dev_addr[i] = ior(db, i+DM9000_PAR); ndev->dev_addr[i] = ior(db, i+DM9000_PAR);
...@@ -746,7 +746,7 @@ dm9000_open(struct net_device *dev) ...@@ -746,7 +746,7 @@ dm9000_open(struct net_device *dev)
dev_warn(db->dev, "WARNING: no IRQ resource flags set.\n"); dev_warn(db->dev, "WARNING: no IRQ resource flags set.\n");
irqflags = DEFAULT_TRIGGER; irqflags = DEFAULT_TRIGGER;
} }
irqflags |= IRQF_SHARED; irqflags |= IRQF_SHARED;
if (request_irq(dev->irq, &dm9000_interrupt, irqflags, dev->name, dev)) 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,7 +1089,7 @@ static int dm9000_wait_eeprom(board_info_t *db)
/* The DM9000 data sheets say we should be able to /* The DM9000 data sheets say we should be able to
* poll the ERRE bit in EPCR to wait for the EEPROM * poll the ERRE bit in EPCR to wait for the EEPROM
* operation. From testing several chips, this bit * operation. From testing several chips, this bit
* does not seem to work. * does not seem to work.
* *
* We attempt to use the bit, but fall back to the * We attempt to use the bit, but fall back to the
* timeout (which is why we do not return an error * timeout (which is why we do not return an error
......
...@@ -925,7 +925,7 @@ int startup_gfar(struct net_device *dev) ...@@ -925,7 +925,7 @@ int startup_gfar(struct net_device *dev)
tx_irq_fail: tx_irq_fail:
free_irq(priv->interruptError, dev); free_irq(priv->interruptError, dev);
err_irq_fail: err_irq_fail:
err_rxalloc_fail: err_rxalloc_fail:
rx_skb_fail: rx_skb_fail:
free_skb_resources(priv); free_skb_resources(priv);
tx_skb_fail: tx_skb_fail:
......
...@@ -664,7 +664,7 @@ static ssize_t natsemi_show_##_name(struct device *dev, \ ...@@ -664,7 +664,7 @@ static ssize_t natsemi_show_##_name(struct device *dev, \
NATSEMI_ATTR(dspcfg_workaround); NATSEMI_ATTR(dspcfg_workaround);
static ssize_t natsemi_show_dspcfg_workaround(struct device *dev, static ssize_t natsemi_show_dspcfg_workaround(struct device *dev,
struct device_attribute *attr, struct device_attribute *attr,
char *buf) char *buf)
{ {
struct netdev_private *np = netdev_priv(to_net_dev(dev)); 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,7 +687,7 @@ static ssize_t natsemi_set_dspcfg_workaround(struct device *dev,
|| !strncmp("0", buf, count - 1)) || !strncmp("0", buf, count - 1))
new_setting = 0; new_setting = 0;
else else
return count; return count;
spin_lock_irqsave(&np->lock, flags); spin_lock_irqsave(&np->lock, flags);
......
...@@ -281,7 +281,7 @@ ...@@ -281,7 +281,7 @@
#define XMAC_ADDR1 0x000a8UL #define XMAC_ADDR1 0x000a8UL
#define XMAC_ADDR1_ADDR1 0x000000000000ffffULL #define XMAC_ADDR1_ADDR1 0x000000000000ffffULL
#define XMAC_ADDR2 0x000b0UL #define XMAC_ADDR2 0x000b0UL
#define XMAC_ADDR2_ADDR2 0x000000000000ffffULL #define XMAC_ADDR2_ADDR2 0x000000000000ffffULL
#define XMAC_ADDR_CMPEN 0x00208UL #define XMAC_ADDR_CMPEN 0x00208UL
......
...@@ -2006,7 +2006,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev) ...@@ -2006,7 +2006,7 @@ pcnet32_probe1(unsigned long ioaddr, int shared, struct pci_dev *pdev)
err_free_ring: err_free_ring:
pcnet32_free_ring(dev); pcnet32_free_ring(dev);
err_free_consistent: err_free_consistent:
pci_free_consistent(lp->pci_dev, sizeof(*lp->init_block), pci_free_consistent(lp->pci_dev, sizeof(*lp->init_block),
lp->init_block, lp->init_dma_addr); lp->init_block, lp->init_dma_addr);
err_free_netdev: err_free_netdev:
free_netdev(dev); free_netdev(dev);
...@@ -3006,7 +3006,7 @@ static void __devexit pcnet32_remove_one(struct pci_dev *pdev) ...@@ -3006,7 +3006,7 @@ static void __devexit pcnet32_remove_one(struct pci_dev *pdev)
unregister_netdev(dev); unregister_netdev(dev);
pcnet32_free_ring(dev); pcnet32_free_ring(dev);
release_region(dev->base_addr, PCNET32_TOTAL_SIZE); release_region(dev->base_addr, PCNET32_TOTAL_SIZE);
pci_free_consistent(lp->pci_dev, sizeof(*lp->init_block), pci_free_consistent(lp->pci_dev, sizeof(*lp->init_block),
lp->init_block, lp->init_dma_addr); lp->init_block, lp->init_dma_addr);
free_netdev(dev); free_netdev(dev);
pci_disable_device(pdev); pci_disable_device(pdev);
...@@ -3089,7 +3089,7 @@ static void __exit pcnet32_cleanup_module(void) ...@@ -3089,7 +3089,7 @@ static void __exit pcnet32_cleanup_module(void)
unregister_netdev(pcnet32_dev); unregister_netdev(pcnet32_dev);
pcnet32_free_ring(pcnet32_dev); pcnet32_free_ring(pcnet32_dev);
release_region(pcnet32_dev->base_addr, PCNET32_TOTAL_SIZE); release_region(pcnet32_dev->base_addr, PCNET32_TOTAL_SIZE);
pci_free_consistent(lp->pci_dev, sizeof(*lp->init_block), pci_free_consistent(lp->pci_dev, sizeof(*lp->init_block),
lp->init_block, lp->init_dma_addr); lp->init_block, lp->init_dma_addr);
free_netdev(pcnet32_dev); free_netdev(pcnet32_dev);
pcnet32_dev = next_dev; pcnet32_dev = next_dev;
......
...@@ -1437,9 +1437,9 @@ static void ql_phy_start_neg_ex(struct ql3_adapter *qdev) ...@@ -1437,9 +1437,9 @@ static void ql_phy_start_neg_ex(struct ql3_adapter *qdev)
reg &= ~PHY_GIG_ALL_PARAMS; reg &= ~PHY_GIG_ALL_PARAMS;
if(portConfiguration & PORT_CONFIG_1000MB_SPEED) { if(portConfiguration & PORT_CONFIG_1000MB_SPEED) {
if(portConfiguration & PORT_CONFIG_FULL_DUPLEX_ENABLED) if(portConfiguration & PORT_CONFIG_FULL_DUPLEX_ENABLED)
reg |= PHY_GIG_ADV_1000F; reg |= PHY_GIG_ADV_1000F;
else else
reg |= PHY_GIG_ADV_1000H; reg |= PHY_GIG_ADV_1000H;
} }
......
...@@ -2547,7 +2547,7 @@ static int fill_rx_buffers(struct ring_info *ring) ...@@ -2547,7 +2547,7 @@ static int fill_rx_buffers(struct ring_info *ring)
if (block_no) if (block_no)
rxd_index += (block_no * ring->rxd_count); rxd_index += (block_no * ring->rxd_count);
if ((block_no == block_no1) && if ((block_no == block_no1) &&
(off == ring->rx_curr_get_info.offset) && (off == ring->rx_curr_get_info.offset) &&
(rxdp->Host_Control)) { (rxdp->Host_Control)) {
DBG_PRINT(INTR_DBG, "%s: Get and Put", DBG_PRINT(INTR_DBG, "%s: Get and Put",
...@@ -2593,7 +2593,7 @@ static int fill_rx_buffers(struct ring_info *ring) ...@@ -2593,7 +2593,7 @@ static int fill_rx_buffers(struct ring_info *ring)
first_rxdp->Control_1 |= RXD_OWN_XENA; first_rxdp->Control_1 |= RXD_OWN_XENA;
} }
stats->mem_alloc_fail_cnt++; stats->mem_alloc_fail_cnt++;
return -ENOMEM ; return -ENOMEM ;
} }
stats->mem_allocated += skb->truesize; stats->mem_allocated += skb->truesize;
......
...@@ -747,7 +747,7 @@ struct ring_info { ...@@ -747,7 +747,7 @@ struct ring_info {
/* interface MTU value */ /* interface MTU value */
unsigned mtu; unsigned mtu;
/* Buffer Address store. */ /* Buffer Address store. */
struct buffAdd **ba; struct buffAdd **ba;
......
...@@ -1063,7 +1063,7 @@ static void sbmac_netpoll(struct net_device *netdev) ...@@ -1063,7 +1063,7 @@ static void sbmac_netpoll(struct net_device *netdev)
((M_MAC_INT_EOP_COUNT | M_MAC_INT_EOP_TIMER) << S_MAC_RX_CH0), ((M_MAC_INT_EOP_COUNT | M_MAC_INT_EOP_TIMER) << S_MAC_RX_CH0),
sc->sbm_imr); sc->sbm_imr);
#else #else
__raw_writeq((M_MAC_INT_CHANNEL << S_MAC_TX_CH0) | __raw_writeq((M_MAC_INT_CHANNEL << S_MAC_TX_CH0) |
(M_MAC_INT_CHANNEL << S_MAC_RX_CH0), sc->sbm_imr); (M_MAC_INT_CHANNEL << S_MAC_RX_CH0), sc->sbm_imr);
#endif #endif
} }
......
...@@ -1656,7 +1656,7 @@ static inline void sis190_init_rxfilter(struct net_device *dev) ...@@ -1656,7 +1656,7 @@ static inline void sis190_init_rxfilter(struct net_device *dev)
SIS_PCI_COMMIT(); SIS_PCI_COMMIT();
} }
static int __devinit sis190_get_mac_addr(struct pci_dev *pdev, static int __devinit sis190_get_mac_addr(struct pci_dev *pdev,
struct net_device *dev) struct net_device *dev)
{ {
int rc; int rc;
......
...@@ -1766,7 +1766,7 @@ static int sis900_rx(struct net_device *net_dev) ...@@ -1766,7 +1766,7 @@ static int sis900_rx(struct net_device *net_dev)
skb = sis_priv->rx_skbuff[entry]; skb = sis_priv->rx_skbuff[entry];
net_dev->stats.rx_dropped++; net_dev->stats.rx_dropped++;
goto refill_rx_ring; goto refill_rx_ring;
} }
/* This situation should never happen, but due to /* This situation should never happen, but due to
some unknow bugs, it is possible that some unknow bugs, it is possible that
......
...@@ -3369,7 +3369,7 @@ static void sky2_led(struct sky2_port *sky2, enum led_mode mode) ...@@ -3369,7 +3369,7 @@ static void sky2_led(struct sky2_port *sky2, enum led_mode mode)
gm_phy_write(hw, port, PHY_MARV_EXT_ADR, pg); gm_phy_write(hw, port, PHY_MARV_EXT_ADR, pg);
} else } else
gm_phy_write(hw, port, PHY_MARV_LED_OVER, gm_phy_write(hw, port, PHY_MARV_LED_OVER,
PHY_M_LED_MO_DUP(mode) | PHY_M_LED_MO_DUP(mode) |
PHY_M_LED_MO_10(mode) | PHY_M_LED_MO_10(mode) |
PHY_M_LED_MO_100(mode) | PHY_M_LED_MO_100(mode) |
......
...@@ -1704,7 +1704,7 @@ spider_net_poll_controller(struct net_device *netdev) ...@@ -1704,7 +1704,7 @@ spider_net_poll_controller(struct net_device *netdev)
* *
* spider_net_enable_interrupt enables several interrupts * spider_net_enable_interrupt enables several interrupts
*/ */
static void static void
spider_net_enable_interrupts(struct spider_net_card *card) spider_net_enable_interrupts(struct spider_net_card *card)
{ {
spider_net_write_reg(card, SPIDER_NET_GHIINT0MSK, spider_net_write_reg(card, SPIDER_NET_GHIINT0MSK,
...@@ -1721,7 +1721,7 @@ spider_net_enable_interrupts(struct spider_net_card *card) ...@@ -1721,7 +1721,7 @@ spider_net_enable_interrupts(struct spider_net_card *card)
* *
* spider_net_disable_interrupts disables all the interrupts * spider_net_disable_interrupts disables all the interrupts
*/ */
static void static void
spider_net_disable_interrupts(struct spider_net_card *card) spider_net_disable_interrupts(struct spider_net_card *card)
{ {
spider_net_write_reg(card, SPIDER_NET_GHIINT0MSK, 0); spider_net_write_reg(card, SPIDER_NET_GHIINT0MSK, 0);
......
...@@ -1526,7 +1526,7 @@ static int tsi108_get_settings(struct net_device *dev, struct ethtool_cmd *cmd) ...@@ -1526,7 +1526,7 @@ static int tsi108_get_settings(struct net_device *dev, struct ethtool_cmd *cmd)
struct tsi108_prv_data *data = netdev_priv(dev); struct tsi108_prv_data *data = netdev_priv(dev);
unsigned long flags; unsigned long flags;
int rc; int rc;
spin_lock_irqsave(&data->txlock, flags); spin_lock_irqsave(&data->txlock, flags);
rc = mii_ethtool_gset(&data->mii_if, cmd); rc = mii_ethtool_gset(&data->mii_if, cmd);
spin_unlock_irqrestore(&data->txlock, flags); spin_unlock_irqrestore(&data->txlock, flags);
...@@ -1543,7 +1543,7 @@ static int tsi108_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) ...@@ -1543,7 +1543,7 @@ static int tsi108_set_settings(struct net_device *dev, struct ethtool_cmd *cmd)
spin_lock_irqsave(&data->txlock, flags); spin_lock_irqsave(&data->txlock, flags);
rc = mii_ethtool_sset(&data->mii_if, cmd); rc = mii_ethtool_sset(&data->mii_if, cmd);
spin_unlock_irqrestore(&data->txlock, flags); spin_unlock_irqrestore(&data->txlock, flags);
return rc; return rc;
} }
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
* *
* Author: Li Yang <leoli@freescale.com> * Author: Li Yang <leoli@freescale.com>
* *
* Limitation: * Limitation:
* Can only get/set setttings of the first queue. * Can only get/set setttings of the first queue.
* Need to re-open the interface manually after changing some paramters. * Need to re-open the interface manually after changing some paramters.
* *
...@@ -165,7 +165,7 @@ uec_set_pauseparam(struct net_device *netdev, ...@@ -165,7 +165,7 @@ uec_set_pauseparam(struct net_device *netdev,
ugeth->ug_info->receiveFlowControl = pause->rx_pause; ugeth->ug_info->receiveFlowControl = pause->rx_pause;
ugeth->ug_info->transmitFlowControl = pause->tx_pause; ugeth->ug_info->transmitFlowControl = pause->tx_pause;
if (ugeth->phydev->autoneg) { if (ugeth->phydev->autoneg) {
if (netif_running(netdev)) { if (netif_running(netdev)) {
/* FIXME: automatically restart */ /* FIXME: automatically restart */
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册