diff options
| author | Claudiu Manoil <claudiu.manoil@freescale.com> | 2013-03-21 07:12:14 +0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-03-21 20:01:34 +0400 |
| commit | c6e1160ed6e015dcf7f361d3829169751239df05 (patch) | |
| tree | f3c9b00c63b00d30546da9cbe87400f11af62212 /drivers/net/ethernet | |
| parent | 39c0a0d5be287415ef0dc0dc15813e6fc86487e9 (diff) | |
| download | linux-c6e1160ed6e015dcf7f361d3829169751239df05.tar.xz | |
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/ethernet')
| -rw-r--r-- | drivers/net/ethernet/freescale/gianfar.c | 7 |
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) } for (i = 0; i < priv->num_tx_queues; i++) - priv->tx_queue[i] = NULL; + priv->tx_queue[i] = NULL; for (i = 0; i < priv->num_rx_queues; i++) priv->rx_queue[i] = NULL; @@ -1824,6 +1824,7 @@ static void gfar_configure_coalescing(struct gfar_private *priv, if (priv->mode == MQ_MG_MODE) { int i = 0; + baddr = ®s->txic0; for_each_set_bit(i, &tx_mask, priv->num_tx_queues) { gfar_write(baddr + i, 0); @@ -1838,7 +1839,7 @@ static void gfar_configure_coalescing(struct gfar_private *priv, gfar_write(baddr + i, priv->rx_queue[i]->rxic); } } else { - /* Backward compatible case ---- even if we enable + /* Backward compatible case -- even if we enable * multiple queues, there's only single reg to program */ gfar_write(®s->txic, 0); @@ -2478,7 +2479,6 @@ static void gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue) struct net_device *dev = tx_queue->dev; struct netdev_queue *txq; struct gfar_private *priv = netdev_priv(dev); - struct gfar_priv_rx_q *rx_queue = NULL; struct txbd8 *bdp, *next = NULL; struct txbd8 *lbdp = NULL; 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) u32 lstatus; size_t buflen; - rx_queue = priv->rx_queue[tqi]; txq = netdev_get_tx_queue(dev, tqi); bdp = tx_queue->dirty_tx; skb_dirtytx = tx_queue->skb_dirtytx; |