]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
RDMA/bnxt_re: Remove a redundant flag
authorKalesh AP <kalesh-anakkur.purayil@broadcom.com>
Thu, 3 Aug 2023 08:45:22 +0000 (01:45 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 13 Sep 2023 07:48:29 +0000 (09:48 +0200)
[ Upstream commit fd28c8a8c7a10e7b53851129c6d8dc5945108fe9 ]

After the cited commit, BNXT_RE_FLAG_GOT_MSIX is redundant.
Remove it.

Fixes: 303432211324 ("bnxt_en: Remove runtime interrupt vector allocation")
Signed-off-by: Kalesh AP <kalesh-anakkur.purayil@broadcom.com>
Signed-off-by: Selvin Xavier <selvin.xavier@broadcom.com>
Link: https://lore.kernel.org/r/1691052326-32143-3-git-send-email-selvin.xavier@broadcom.com
Signed-off-by: Leon Romanovsky <leon@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/infiniband/hw/bnxt_re/bnxt_re.h
drivers/infiniband/hw/bnxt_re/main.c

index eef3ef3fabb4293cc4bd6f125cb4930ae32db673..bacb1b6723ef875e2355b2bf64296dd066ce9dcf 100644 (file)
@@ -116,7 +116,6 @@ struct bnxt_re_dev {
        struct list_head                list;
        unsigned long                   flags;
 #define BNXT_RE_FLAG_NETDEV_REGISTERED         0
-#define BNXT_RE_FLAG_GOT_MSIX                  2
 #define BNXT_RE_FLAG_HAVE_L2_REF               3
 #define BNXT_RE_FLAG_RCFW_CHANNEL_EN           4
 #define BNXT_RE_FLAG_QOS_WORK_REG              5
index 4f00fb7869f8e0a3d5d053abf222f5899b6088d1..bfab2c83faf92668842301fc2c1589e2b5db7f67 100644 (file)
@@ -1113,8 +1113,8 @@ static void bnxt_re_dev_uninit(struct bnxt_re_dev *rdev)
                bnxt_re_net_ring_free(rdev, rdev->rcfw.creq.ring_id, type);
                bnxt_qplib_free_rcfw_channel(&rdev->rcfw);
        }
-       if (test_and_clear_bit(BNXT_RE_FLAG_GOT_MSIX, &rdev->flags))
-               rdev->num_msix = 0;
+
+       rdev->num_msix = 0;
 
        bnxt_re_destroy_chip_ctx(rdev);
        if (test_and_clear_bit(BNXT_RE_FLAG_NETDEV_REGISTERED, &rdev->flags))
@@ -1170,7 +1170,6 @@ static int bnxt_re_dev_init(struct bnxt_re_dev *rdev, u8 wqe_mode)
        ibdev_dbg(&rdev->ibdev, "Got %d MSI-X vectors\n",
                  rdev->en_dev->ulp_tbl->msix_requested);
        rdev->num_msix = rdev->en_dev->ulp_tbl->msix_requested;
-       set_bit(BNXT_RE_FLAG_GOT_MSIX, &rdev->flags);
 
        bnxt_re_query_hwrm_intf_version(rdev);