github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-31 02:24:24 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

net: macb: drop count local variable in macb_tx_map()

Browse Source 
Local variable `count` is useless: it counts number of DMA descriptors
used and returns it. But the return value is only checked for error.
Drop counting the number of DMA descriptors and return a usual
negative-if-error integer.

Signed-off-by: Théo Lebrun <theo.lebrun@bootlin.com>
Link: https://patch.msgid.link/20251014-macb-cleanup-v1-13-31cd266e22cd@bootlin.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
This commit is contained in:
Théo Lebrun 2025-10-14 17:25:14 +02:00 committed by Jakub Kicinski
parent 027202adf0
commit b5fe4f3e59
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/net/ethernet/cadence/macb_main.c
View File

@ -1992,7 +1992,7 @@ static unsigned int macb_tx_map(struct macb *bp,
unsigned int len, i, tx_head = queue->tx_head;
struct macb_tx_skb *tx_skb = NULL;
struct macb_dma_desc *desc;
unsigned int offset, size, count = 0;
unsigned int offset, size;
unsigned int f, nr_frags = skb_shinfo(skb)->nr_frags;
unsigned int eof = 1, mss_mfs = 0;
u32 ctrl, lso_ctrl = 0, seq_ctrl = 0;
@ -2031,7 +2031,6 @@ static unsigned int macb_tx_map(struct macb *bp,
len -= size;
offset += size;
count++;
tx_head++;
size = umin(len, bp->max_tx_length);
@ -2060,7 +2059,6 @@ static unsigned int macb_tx_map(struct macb *bp,
len -= size;
offset += size;
count++;
tx_head++;
}
}
@ -2139,7 +2137,7 @@ static unsigned int macb_tx_map(struct macb *bp,
queue->tx_head = tx_head;
return count;
return 0;
dma_error:
netdev_err(bp->dev, "TX DMA map failed\n");
@ -2150,7 +2148,7 @@ static unsigned int macb_tx_map(struct macb *bp,
macb_tx_unmap(bp, tx_skb, 0);
}
return 0;
return -ENOMEM;
}
static netdev_features_t macb_features_check(struct sk_buff *skb,
@ -2336,7 +2334,7 @@ static netdev_tx_t macb_start_xmit(struct sk_buff *skb, struct net_device *dev)
}
/* Map socket buffer for DMA transfer */
if (!macb_tx_map(bp, queue, skb, hdrlen)) {
if (macb_tx_map(bp, queue, skb, hdrlen)) {
dev_kfree_skb_any(skb);
goto unlock;
}