Commit c6e1160e authored by Claudiu Manoil's avatar Claudiu Manoil Committed by David S. Miller

gianfar: Cleanup dead code and minor formatting

Signed-off-by: default avatarClaudiu Manoil <claudiu.manoil@freescale.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 39c0a0d5
...@@ -690,7 +690,7 @@ static int gfar_of_init(struct platform_device *ofdev, struct net_device **pdev) ...@@ -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++) 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++) for (i = 0; i < priv->num_rx_queues; i++)
priv->rx_queue[i] = NULL; priv->rx_queue[i] = NULL;
...@@ -1824,6 +1824,7 @@ static void gfar_configure_coalescing(struct gfar_private *priv, ...@@ -1824,6 +1824,7 @@ static void gfar_configure_coalescing(struct gfar_private *priv,
if (priv->mode == MQ_MG_MODE) { if (priv->mode == MQ_MG_MODE) {
int i = 0; int i = 0;
baddr = &regs->txic0; baddr = &regs->txic0;
for_each_set_bit(i, &tx_mask, priv->num_tx_queues) { for_each_set_bit(i, &tx_mask, priv->num_tx_queues) {
gfar_write(baddr + i, 0); gfar_write(baddr + i, 0);
...@@ -1838,7 +1839,7 @@ static void gfar_configure_coalescing(struct gfar_private *priv, ...@@ -1838,7 +1839,7 @@ static void gfar_configure_coalescing(struct gfar_private *priv,
gfar_write(baddr + i, priv->rx_queue[i]->rxic); gfar_write(baddr + i, priv->rx_queue[i]->rxic);
} }
} else { } else {
/* Backward compatible case ---- even if we enable /* Backward compatible case -- even if we enable
* multiple queues, there's only single reg to program * multiple queues, there's only single reg to program
*/ */
gfar_write(&regs->txic, 0); gfar_write(&regs->txic, 0);
...@@ -2478,7 +2479,6 @@ static void gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue) ...@@ -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 net_device *dev = tx_queue->dev;
struct netdev_queue *txq; struct netdev_queue *txq;
struct gfar_private *priv = netdev_priv(dev); struct gfar_private *priv = netdev_priv(dev);
struct gfar_priv_rx_q *rx_queue = NULL;
struct txbd8 *bdp, *next = NULL; struct txbd8 *bdp, *next = NULL;
struct txbd8 *lbdp = NULL; struct txbd8 *lbdp = NULL;
struct txbd8 *base = tx_queue->tx_bd_base; 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,7 +2493,6 @@ static void gfar_clean_tx_ring(struct gfar_priv_tx_q *tx_queue)
u32 lstatus; u32 lstatus;
size_t buflen; size_t buflen;
rx_queue = priv->rx_queue[tqi];
txq = netdev_get_tx_queue(dev, tqi); txq = netdev_get_tx_queue(dev, tqi);
bdp = tx_queue->dirty_tx; bdp = tx_queue->dirty_tx;
skb_dirtytx = tx_queue->skb_dirtytx; skb_dirtytx = tx_queue->skb_dirtytx;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment