net: hns3: rename buffer-related functions
authorBarry Song <song.bao.hua@hisilicon.com>
Thu, 18 Jun 2020 01:02:09 +0000 (13:02 +1200)
committerDavid S. Miller <davem@davemloft.net>
Fri, 19 Jun 2020 03:43:10 +0000 (20:43 -0700)
This is for improving the readability.

Signed-off-by: Barry Song <song.bao.hua@hisilicon.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/hisilicon/hns3/hns3_enet.c

index 61b5a849b1628bfd188595e00715fd5782e4e5ef..3cd2216e49b91d1261c15c2f83541f82416ac787 100644 (file)
@@ -2405,7 +2405,7 @@ static int hns3_alloc_desc(struct hns3_enet_ring *ring)
        return 0;
 }
 
-static int hns3_reserve_buffer_map(struct hns3_enet_ring *ring,
+static int hns3_alloc_and_map_buffer(struct hns3_enet_ring *ring,
                                   struct hns3_desc_cb *cb)
 {
        int ret;
@@ -2426,9 +2426,9 @@ out:
        return ret;
 }
 
-static int hns3_alloc_buffer_attach(struct hns3_enet_ring *ring, int i)
+static int hns3_alloc_and_attach_buffer(struct hns3_enet_ring *ring, int i)
 {
-       int ret = hns3_reserve_buffer_map(ring, &ring->desc_cb[i]);
+       int ret = hns3_alloc_and_map_buffer(ring, &ring->desc_cb[i]);
 
        if (ret)
                return ret;
@@ -2444,7 +2444,7 @@ static int hns3_alloc_ring_buffers(struct hns3_enet_ring *ring)
        int i, j, ret;
 
        for (i = 0; i < ring->desc_num; i++) {
-               ret = hns3_alloc_buffer_attach(ring, i);
+               ret = hns3_alloc_and_attach_buffer(ring, i);
                if (ret)
                        goto out_buffer_fail;
        }
@@ -2590,7 +2590,7 @@ static void hns3_nic_alloc_rx_buffers(struct hns3_enet_ring *ring,
 
                        hns3_reuse_buffer(ring, ring->next_to_use);
                } else {
-                       ret = hns3_reserve_buffer_map(ring, &res_cbs);
+                       ret = hns3_alloc_and_map_buffer(ring, &res_cbs);
                        if (ret) {
                                u64_stats_update_begin(&ring->syncp);
                                ring->stats.sw_err_cnt++;
@@ -4184,7 +4184,7 @@ static int hns3_clear_rx_ring(struct hns3_enet_ring *ring)
                 * stack, so we need to replace the buffer here.
                 */
                if (!ring->desc_cb[ring->next_to_use].reuse_flag) {
-                       ret = hns3_reserve_buffer_map(ring, &res_cbs);
+                       ret = hns3_alloc_and_map_buffer(ring, &res_cbs);
                        if (ret) {
                                u64_stats_update_begin(&ring->syncp);
                                ring->stats.sw_err_cnt++;