aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorClaudiu Manoil <claudiu.manoil@freescale.com>2013-03-20 23:12:14 -0400
committerDavid S. Miller <davem@davemloft.net>2013-03-21 12:01:34 -0400
commitc6e1160ed6e015dcf7f361d3829169751239df05 (patch)
treef3c9b00c63b00d30546da9cbe87400f11af62212 /drivers/net
parent39c0a0d5be287415ef0dc0dc15813e6fc86487e9 (diff)
gianfar: Cleanup dead code and minor formatting
Signed-off-by: Claudiu Manoil <claudiu.manoil@freescale.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/ethernet/freescale/gianfar.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/ethernet/freescale/gianfar.c b/drivers/net/ethernet/freescale/gianfar.c
index 37fbf6756297..434b31bd88e6 100644
--- a/drivers/net/ethernet/freescale/gianfar.c
+++ b/drivers/net/ethernet/freescale/gianfar.c
@@ -690,7 +690,7 @@ static int gfar_of_init(struct platform_device *ofdev, struct net_device **pdev)
690 } 690 }
691 691
692 for (i = 0; i < priv->num_tx_queues; i++) 692 for (i = 0; i < priv->num_tx_queues; i++)
693 priv->tx_queue[i] = NULL; 693 priv->tx_queue[i] = NULL;
694 for (i = 0; i < priv->num_rx_queues; i++) 694 for (i = 0; i < priv->num_rx_queues; i++)
695 priv->rx_queue[i] = NULL; 695 priv->rx_queue[i] = NULL;
696 696
@@ -1824,6 +1824,7 @@ static void gfar_configure_coalescing(struct gfar_private *priv,
1824 1824
1825 if (priv->mode == MQ_MG_MODE) { 1825 if (priv->mode == MQ_MG_MODE) {
1826 int i = 0; 1826 int i = 0;
1827
1827 baddr = &regs->txic0; 1828 baddr = &regs->txic0;
1828 for_each_set_bit(i, &tx_mask, priv->num_tx_queues) { 1829 for_each_set_bit(i, &tx_mask, priv->num_tx_queues) {
1829 gfar_write(baddr + i, 0); 1830 gfar_write(baddr + i, 0);
@@ -1838,7 +1839,7 @@ static void gfar_configure_coalescing(struct gfar_private *priv,
1838 gfar_write(baddr + i, priv->rx_queue[i]->rxic); 1839 gfar_write(baddr + i, priv->rx_queue[i]->rxic);
1839 } 1840 }
1840 } else { 1841 } else {
1841 /* Backward compatible case ---- even if we enable 1842 /* Backward compatible case -- even if we enable
1842 * multiple queues, there's only single reg to program 1843 * multiple queues, there's only single reg to program
1843 */ 1844 */
1844 gfar_write(&regs->txic, 0); 1845 gfar_write(&regs->txic, 0);
@@ -2478,7 +2479,6 @@ static void gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue)
2478 struct net_device *dev = tx_queue->dev; 2479 struct net_device *dev = tx_queue->dev;
2479 struct netdev_queue *txq; 2480 struct netdev_queue *txq;
2480 struct gfar_private *priv = netdev_priv(dev); 2481 struct gfar_private *priv = netdev_priv(dev);
2481 struct gfar_priv_rx_q *rx_queue = NULL;
2482 struct txbd8 *bdp, *next = NULL; 2482 struct txbd8 *bdp, *next = NULL;
2483 struct txbd8 *lbdp = NULL; 2483 struct txbd8 *lbdp = NULL;
2484 struct txbd8 *base = tx_queue->tx_bd_base; 2484 struct txbd8 *base = tx_queue->tx_bd_base;
@@ -2493,7 +2493,6 @@ static void gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue)
2493 u32 lstatus; 2493 u32 lstatus;
2494 size_t buflen; 2494 size_t buflen;
2495 2495
2496 rx_queue = priv->rx_queue[tqi];
2497 txq = netdev_get_tx_queue(dev, tqi); 2496 txq = netdev_get_tx_queue(dev, tqi);
2498 bdp = tx_queue->dirty_tx; 2497 bdp = tx_queue->dirty_tx;
2499 skb_dirtytx = tx_queue->skb_dirtytx; 2498 skb_dirtytx = tx_queue->skb_dirtytx;