lkml.org 
[lkml]   [2022]   [Aug]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 214/545] hinic: Use the bitmap API when applicable
    Date
    From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>

    [ Upstream commit 7c2c57263af41cfd8b5022274e6801542831bb69 ]

    'vlan_bitmap' is a bitmap and is used as such. So allocate it with
    devm_bitmap_zalloc() and its explicit bit size (i.e. VLAN_N_VID).

    This avoids the need of the VLAN_BITMAP_SIZE macro which:
    - needlessly has a 'nic_dev' parameter
    - should be "long" (and not byte) aligned, so that the bitmap semantic
    is respected

    This is in fact not an issue because VLAN_N_VID is 4096 at the time
    being, but devm_bitmap_zalloc() is less verbose and easier to understand.

    Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
    Link: https://lore.kernel.org/r/6ff7b7d21414240794a77dc2456914412718a145.1656260842.git.christophe.jaillet@wanadoo.fr
    Signed-off-by: Jakub Kicinski <kuba@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/huawei/hinic/hinic_main.c | 7 ++-----
    1 file changed, 2 insertions(+), 5 deletions(-)

    diff --git a/drivers/net/ethernet/huawei/hinic/hinic_main.c b/drivers/net/ethernet/huawei/hinic/hinic_main.c
    index ace949fe6233..2376edf6c263 100644
    --- a/drivers/net/ethernet/huawei/hinic/hinic_main.c
    +++ b/drivers/net/ethernet/huawei/hinic/hinic_main.c
    @@ -62,8 +62,6 @@ MODULE_PARM_DESC(rx_weight, "Number Rx packets for NAPI budget (default=64)");

    #define HINIC_LRO_RX_TIMER_DEFAULT 16

    -#define VLAN_BITMAP_SIZE(nic_dev) (ALIGN(VLAN_N_VID, 8) / 8)
    -
    #define work_to_rx_mode_work(work) \
    container_of(work, struct hinic_rx_mode_work, work)

    @@ -1248,9 +1246,8 @@ static int nic_dev_init(struct pci_dev *pdev)
    u64_stats_init(&tx_stats->syncp);
    u64_stats_init(&rx_stats->syncp);

    - nic_dev->vlan_bitmap = devm_kzalloc(&pdev->dev,
    - VLAN_BITMAP_SIZE(nic_dev),
    - GFP_KERNEL);
    + nic_dev->vlan_bitmap = devm_bitmap_zalloc(&pdev->dev, VLAN_N_VID,
    + GFP_KERNEL);
    if (!nic_dev->vlan_bitmap) {
    err = -ENOMEM;
    goto err_vlan_bitmap;
    --
    2.35.1


    \
     
     \ /
      Last update: 2022-08-19 18:12    [W:4.144 / U:0.396 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site