Skip to content

Commit 5c74064

Browse files
haiyangzkuba-moo
authored andcommitted
net: mana: Rename mana_refill_rxoob and remove some empty lines
Rename mana_refill_rxoob for naming consistency. And remove some empty lines between function call and error checking. Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 8e8e47d commit 5c74064

1 file changed

Lines changed: 3 additions & 6 deletions

File tree

drivers/net/ethernet/microsoft/mana/mana_en.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,6 @@ static int mana_pre_alloc_rxbufs(struct mana_port_context *mpc, int new_mtu)
563563

564564
da = dma_map_single(dev, va + mpc->rxbpre_headroom,
565565
mpc->rxbpre_datasize, DMA_FROM_DEVICE);
566-
567566
if (dma_mapping_error(dev, da)) {
568567
put_page(virt_to_head_page(va));
569568
goto error;
@@ -1515,7 +1514,6 @@ static void *mana_get_rxfrag(struct mana_rxq *rxq, struct device *dev,
15151514

15161515
*da = dma_map_single(dev, va + rxq->headroom, rxq->datasize,
15171516
DMA_FROM_DEVICE);
1518-
15191517
if (dma_mapping_error(dev, *da)) {
15201518
put_page(virt_to_head_page(va));
15211519
return NULL;
@@ -1525,14 +1523,13 @@ static void *mana_get_rxfrag(struct mana_rxq *rxq, struct device *dev,
15251523
}
15261524

15271525
/* Allocate frag for rx buffer, and save the old buf */
1528-
static void mana_refill_rxoob(struct device *dev, struct mana_rxq *rxq,
1529-
struct mana_recv_buf_oob *rxoob, void **old_buf)
1526+
static void mana_refill_rx_oob(struct device *dev, struct mana_rxq *rxq,
1527+
struct mana_recv_buf_oob *rxoob, void **old_buf)
15301528
{
15311529
dma_addr_t da;
15321530
void *va;
15331531

15341532
va = mana_get_rxfrag(rxq, dev, &da, true);
1535-
15361533
if (!va)
15371534
return;
15381535

@@ -1597,7 +1594,7 @@ static void mana_process_rx_cqe(struct mana_rxq *rxq, struct mana_cq *cq,
15971594
rxbuf_oob = &rxq->rx_oobs[curr];
15981595
WARN_ON_ONCE(rxbuf_oob->wqe_inf.wqe_size_in_bu != 1);
15991596

1600-
mana_refill_rxoob(dev, rxq, rxbuf_oob, &old_buf);
1597+
mana_refill_rx_oob(dev, rxq, rxbuf_oob, &old_buf);
16011598

16021599
/* Unsuccessful refill will have old_buf == NULL.
16031600
* In this case, mana_rx_skb() will drop the packet.

0 commit comments

Comments
 (0)