Commit 0713a86a authored by Arnaud Ebalard's avatar Arnaud Ebalard Committed by David S. Miller

net: mvneta: mvneta_tx_done_gbe() cleanups

mvneta_tx_done_gbe() return value and third parameter are no more
used. This patch changes the function prototype and removes a useless
variable where the function is called.
Reviewed-by: default avatarWilly Tarreau <w@1wt.eu>
Signed-off-by: default avatarArnaud Ebalard <arno@natisbad.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f19fadfc
...@@ -1704,30 +1704,23 @@ static void mvneta_txq_done_force(struct mvneta_port *pp, ...@@ -1704,30 +1704,23 @@ static void mvneta_txq_done_force(struct mvneta_port *pp,
/* Handle tx done - called in softirq context. The <cause_tx_done> argument /* Handle tx done - called in softirq context. The <cause_tx_done> argument
* must be a valid cause according to MVNETA_TXQ_INTR_MASK_ALL. * must be a valid cause according to MVNETA_TXQ_INTR_MASK_ALL.
*/ */
static u32 mvneta_tx_done_gbe(struct mvneta_port *pp, u32 cause_tx_done, static void mvneta_tx_done_gbe(struct mvneta_port *pp, u32 cause_tx_done)
int *tx_todo)
{ {
struct mvneta_tx_queue *txq; struct mvneta_tx_queue *txq;
u32 tx_done = 0;
struct netdev_queue *nq; struct netdev_queue *nq;
*tx_todo = 0;
while (cause_tx_done) { while (cause_tx_done) {
txq = mvneta_tx_done_policy(pp, cause_tx_done); txq = mvneta_tx_done_policy(pp, cause_tx_done);
nq = netdev_get_tx_queue(pp->dev, txq->id); nq = netdev_get_tx_queue(pp->dev, txq->id);
__netif_tx_lock(nq, smp_processor_id()); __netif_tx_lock(nq, smp_processor_id());
if (txq->count) { if (txq->count)
tx_done += mvneta_txq_done(pp, txq); mvneta_txq_done(pp, txq);
*tx_todo += txq->count;
}
__netif_tx_unlock(nq); __netif_tx_unlock(nq);
cause_tx_done &= ~((1 << txq->id)); cause_tx_done &= ~((1 << txq->id));
} }
return tx_done;
} }
/* Compute crc8 of the specified address, using a unique algorithm , /* Compute crc8 of the specified address, using a unique algorithm ,
...@@ -1961,9 +1954,7 @@ static int mvneta_poll(struct napi_struct *napi, int budget) ...@@ -1961,9 +1954,7 @@ static int mvneta_poll(struct napi_struct *napi, int budget)
/* Release Tx descriptors */ /* Release Tx descriptors */
if (cause_rx_tx & MVNETA_TX_INTR_MASK_ALL) { if (cause_rx_tx & MVNETA_TX_INTR_MASK_ALL) {
int tx_todo = 0; mvneta_tx_done_gbe(pp, (cause_rx_tx & MVNETA_TX_INTR_MASK_ALL));
mvneta_tx_done_gbe(pp, (cause_rx_tx & MVNETA_TX_INTR_MASK_ALL), &tx_todo);
cause_rx_tx &= ~MVNETA_TX_INTR_MASK_ALL; cause_rx_tx &= ~MVNETA_TX_INTR_MASK_ALL;
} }
......
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