[PATCH 29/34] 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>
(cherry picked from commit 5c74064f43c291d9add2b436a2d70205b71a7cc7)
Signed-off-by: Bastian Blank <waldi@debian.org>
Gbp-Pq: Topic features/all/ethernet-microsoft
Gbp-Pq: Name 0029-net-mana-Rename-mana_refill_rxoob-and-remove-some-em.patch

diff --git a/drivers/net/ethernet/microsoft/mana/mana_en.c b/drivers/net/ethernet/microsoft/mana/mana_en.c
index d982af3093e82054256d3c304279813481735e58..1c7e793bb6b8a039d9e9923c34cda72e2f8a23ce 100644 (file)
--- a/drivers/net/ethernet/microsoft/mana/mana_en.c
+++ b/drivers/net/ethernet/microsoft/mana/mana_en.c
@@ -580,7 +580,6 @@ static int mana_pre_alloc_rxbufs(struct mana_port_context *mpc, int new_mtu)
 
                da = dma_map_single(dev, va + mpc->rxbpre_headroom,
                                    mpc->rxbpre_datasize, DMA_FROM_DEVICE);
-
                if (dma_mapping_error(dev, da)) {
                        put_page(virt_to_head_page(va));
                        goto error;
@@ -1548,7 +1547,6 @@ static void *mana_get_rxfrag(struct mana_rxq *rxq, struct device *dev,
 
        *da = dma_map_single(dev, va + rxq->headroom, rxq->datasize,
                             DMA_FROM_DEVICE);
-
        if (dma_mapping_error(dev, *da)) {
                put_page(virt_to_head_page(va));
                return NULL;
@@ -1558,14 +1556,13 @@ static void *mana_get_rxfrag(struct mana_rxq *rxq, struct device *dev,
 }
 
 /* Allocate frag for rx buffer, and save the old buf */
-static void mana_refill_rxoob(struct device *dev, struct mana_rxq *rxq,
-                             struct mana_recv_buf_oob *rxoob, void **old_buf)
+static void mana_refill_rx_oob(struct device *dev, struct mana_rxq *rxq,
+                              struct mana_recv_buf_oob *rxoob, void **old_buf)
 {
        dma_addr_t da;
        void *va;
 
        va = mana_get_rxfrag(rxq, dev, &da, true);
-
        if (!va)
                return;
 
@@ -1630,7 +1627,7 @@ static void mana_process_rx_cqe(struct mana_rxq *rxq, struct mana_cq *cq,
        rxbuf_oob = &rxq->rx_oobs[curr];
        WARN_ON_ONCE(rxbuf_oob->wqe_inf.wqe_size_in_bu != 1);
 
-       mana_refill_rxoob(dev, rxq, rxbuf_oob, &old_buf);
+       mana_refill_rx_oob(dev, rxq, rxbuf_oob, &old_buf);
 
        /* Unsuccessful refill will have old_buf == NULL.
         * In this case, mana_rx_skb() will drop the packet.