au1000-eth: stylistic fixes
Subsystems (2)
PATCH v3 2/7 au1000-eth: stylistic fixes
This patch fixes the following checkpatch.pl warnings:
- spaces after tabs
- space between function and arguments
- one-line statement braces
- tabs instead of spaces
Signed-off-by Florian Fainelli <[email protected]>
---
drivers/net/au1000_eth.c +16 -16
@@ -13,7 +13,7 @@* converted to use linux-2.6.x's PHY framework * * Author: MontaVista Software, Inc. -* [email protected] or [email protected] +* [email protected] or [email protected] * * ######################################################################## *
@@ -152,7 +152,7 @@ static void au1000_enable_mac(struct net_device *dev, int force_reset)spin_lock_irqsave (&aup->lock, flags); -if (force_reset || (!aup->mac_enabled)) { +if (force_reset || (!aup->mac_enabled)) { *aup->enable =MAC_EN_CLOCK_ENABLE ;au_sync_delay (2 ); *aup->enable = (MAC_EN_RESET0 | MAC_EN_RESET1 | MAC_EN_RESET2
@@ -353,7 +353,7 @@ au1000_adjust_link(struct net_device *dev) } } -static int au1000_mii_probe (struct net_device *dev) +static int au1000_mii_probe (struct net_device *dev) {struct au1000_private *const aup =netdev_priv (dev);struct phy_device *phydev =NULL ;
@@ -457,9 +457,9 @@ static struct db_dest *au1000_GetFreeDB(struct au1000_private *aup)struct db_dest *pDB; pDB = aup->pDBfree; -if (pDB) { +if (pDB) aup->pDBfree = pDB->pnext; - } +return pDB; }
@@ -507,7 +507,7 @@ static void au1000_reset_mac(struct net_device *dev)spin_lock_irqsave (&aup->lock, flags); -au1000_reset_mac_unlocked (dev); +au1000_reset_mac_unlocked (dev);spin_unlock_irqrestore (&aup->lock, flags); }
@@ -625,9 +625,9 @@ static int au1000_init(struct net_device *dev) aup->mac->mac_addr_low = dev->dev_addr[3 ]<<24 | dev->dev_addr[2 ]<<16 | dev->dev_addr[1 ]<<8 | dev->dev_addr[0 ]; -for (i =0 ; i <NUM_RX_DMA ; i++) { +for (i =0 ; i <NUM_RX_DMA ; i++) aup->rx_dma_ring[i]->buff_stat |=RX_DMA_ENABLE ; - } +au_sync (); control =MAC_RX_ENABLE |MAC_TX_ENABLE ;
@@ -854,7 +854,7 @@ static int au1000_close(struct net_device *dev)spin_lock_irqsave (&aup->lock, flags); -au1000_reset_mac_unlocked (dev); +au1000_reset_mac_unlocked (dev);/* stop the device */ netif_stop_queue (dev);
@@ -902,9 +902,9 @@ static netdev_tx_t au1000_tx(struct sk_buff *skb, struct net_device *dev) pDB = aup->tx_db_inuse[aup->tx_head];skb_copy_from_linear_data (skb, (void *)pDB->vaddr, skb->len);if (skb->len <ETH_ZLEN ) { -for (i = skb->len; i <ETH_ZLEN ; i++) { +for (i = skb->len; i <ETH_ZLEN ; i++) ((char *)pDB->vaddr)[i] =0 ; - } + ptxd->len =ETH_ZLEN ; }else ptxd->len = skb->len;
@@ -1061,7 +1061,7 @@ static int __devinit au1000_probe(struct platform_device *pdev) goto err_remap1; } -/* Setup some variables for quick register address access */ +/* Setup some variables for quick register address access */ aup->enable = (volatile u32 *)ioremap_nocache (macen->start,resource_size (macen));if (!aup->enable) {dev_err (&pdev->dev,"failed to ioremap MAC enable register\n" );
@@ -1151,17 +1151,17 @@ static int __devinit au1000_probe(struct platform_device *pdev)for (i =0 ; i <NUM_RX_DMA ; i++) { pDB =au1000_GetFreeDB (aup); -if (!pDB) { +if (!pDB) goto err_out; - } + aup->rx_dma_ring[i]->buff_stat = (unsigned )pDB->dma_addr; aup->rx_db_inuse[i] = pDB; }for (i =0 ; i <NUM_TX_DMA ; i++) { pDB =au1000_GetFreeDB (aup); -if (!pDB) { +if (!pDB) goto err_out; - } + aup->tx_dma_ring[i]->buff_stat = (unsigned )pDB->dma_addr; aup->tx_dma_ring[i]->len =0 ; aup->tx_db_inuse[i] = pDB;
From: Florian Fainelli <[email protected]>
Date: Wed, 8 Sep 2010 23:11:31 +0200
Quoted 8 lines
This patch fixes the following checkpatch.pl warnings:
- spaces after tabs
- space between function and arguments
- one-line statement braces
- tabs instead of spacesSigned-off-by Florian Fainelli <[email protected]>
Applied.