lkml.org 
[lkml]   [2019]   [May]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH net-next 12/12] net: hns3: use devm_kcalloc when allocating desc_cb
    Date
    From: Yunsheng Lin <linyunsheng@huawei.com>

    This patch uses devm_kcalloc instead of kcalloc when allocating
    ring->desc_cb, because devm_kcalloc not only ensure to free the
    memory when the dev is deallocted, but also allocate the memory
    from it's device memory node.

    Signed-off-by: Yunsheng Lin <linyunsheng@huawei.com>
    Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
    ---
    drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
    index 65fb421..18711e0 100644
    --- a/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
    +++ b/drivers/net/ethernet/hisilicon/hns3/hns3_enet.c
    @@ -3478,8 +3478,8 @@ static int hns3_alloc_ring_memory(struct hns3_enet_ring *ring)
    if (ring->desc_num <= 0 || ring->buf_size <= 0)
    return -EINVAL;

    - ring->desc_cb = kcalloc(ring->desc_num, sizeof(ring->desc_cb[0]),
    - GFP_KERNEL);
    + ring->desc_cb = devm_kcalloc(ring_to_dev(ring), ring->desc_num,
    + sizeof(ring->desc_cb[0]), GFP_KERNEL);
    if (!ring->desc_cb) {
    ret = -ENOMEM;
    goto out;
    @@ -3500,7 +3500,7 @@ static int hns3_alloc_ring_memory(struct hns3_enet_ring *ring)
    out_with_desc:
    hns3_free_desc(ring);
    out_with_desc_cb:
    - kfree(ring->desc_cb);
    + devm_kfree(ring_to_dev(ring), ring->desc_cb);
    ring->desc_cb = NULL;
    out:
    return ret;
    @@ -3509,7 +3509,7 @@ static int hns3_alloc_ring_memory(struct hns3_enet_ring *ring)
    static void hns3_fini_ring(struct hns3_enet_ring *ring)
    {
    hns3_free_desc(ring);
    - kfree(ring->desc_cb);
    + devm_kfree(ring_to_dev(ring), ring->desc_cb);
    ring->desc_cb = NULL;
    ring->next_to_clean = 0;
    ring->next_to_use = 0;
    --
    2.7.4
    \
     
     \ /
      Last update: 2019-05-06 04:51    [W:2.617 / U:0.320 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site