Skip to contentSkip to conversation

net: mvneta: remove duplicate *_coal assignment

PATCH Applied Jisheng Zhang 2 participants 2 messages Mar 29, 2018 – Mar 30, 2018

Subsystems (3)
Networking Network drivers Marvell mvneta Ethernet driver
lore
Share & tools
lore

Jisheng Zhang

author
#0 lore raw

PATCH 1/1 net: mvneta: remove duplicate *_coal assignment

The style of the rx/tx queue's *_coal member assignment is:

static void foo_coal_set(...)

{
	set the coal in hw;
	update queue's foo_coal member; [1]
}

In other place, we call foo_coal_set(pp, queue->foo_coal), so the above [1] is duplicated and could be removed.

Signed-off-by Jisheng Zhang <[email protected]>
---
 drivers/net/ethernet/marvell/mvneta.c | 4 ----
 1 file changed, 4 deletions(-)
drivers/net/ethernet/marvell/mvneta.c +0 -4
index eaa4bb80f1c9..30aab9bf77cc 100644
@@ -1555,7 +1555,6 @@ static void mvneta_rx_pkts_coal_set(struct mvneta_port *pp,
 {
 	mvreg_write(pp, MVNETA_RXQ_THRESHOLD_REG(rxq->id),
 		    value | MVNETA_RXQ_NON_OCCUPIED(0));
-	rxq->pkts_coal = value;
 }
 
 /* Set the time delay in usec before RX interrupt will be generated by

@@ -1571,7 +1570,6 @@ static void mvneta_rx_time_coal_set(struct mvneta_port *pp,
 	val = (clk_rate / 1000000) * value;
 
 	mvreg_write(pp, MVNETA_RXQ_TIME_COAL_REG(rxq->id), val);
-	rxq->time_coal = value;
 }
 
 /* Set threshold for TX_DONE pkts coalescing */

@@ -1586,8 +1584,6 @@ static void mvneta_tx_done_pkts_coal_set(struct mvneta_port *pp,
 	val |= MVNETA_TXQ_SENT_THRESH_MASK(value);
 
 	mvreg_write(pp, MVNETA_TXQ_SIZE_REG(txq->id), val);
-
-	txq->done_pkts_coal = value;
 }
 
 /* Handle rx descriptor fill by setting buf_cookie and buf_phys_addr */
Signature · 1 line
2.16.3
maintainer Applied
#1 lore raw

From: Jisheng Zhang <[email protected]>
Date: Thu, 29 Mar 2018 17:29:40 +0800

Quoted 8 lines

The style of the rx/tx queue's *_coal member assignment is:

static void foo_coal_set(...)

{
	set the coal in hw;
	update queue's foo_coal member; [1]
}
Quoted 4 lines

In other place, we call foo_coal_set(pp, queue->foo_coal), so the above [1] is duplicated and could be removed.

Signed-off-by Jisheng Zhang <[email protected]>

Applied.

We could make this convention even more explicit by not passing the coalescing parameter into these helpers, but instead using the value in rxq->foo and txq->foo.