RDMA/hns: Remove redundant 'max_srq_desc_sz' in caps

The max_srq_desc_sz is defined in the code, but never used,
so delete this redundant variable.

Link: https://lore.kernel.org/r/20220922123315.3732205-10-xuhaoyue1@hisilicon.com
Signed-off-by: Yangyang Li <liyangyang20@huawei.com>
Signed-off-by: Haoyue Xu <xuhaoyue1@hisilicon.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>

diff --git a/drivers/infiniband/hw/hns/hns_roce_device.h b/drivers/infiniband/hw/hns/hns_roce_device.h
index edd19970931dabc37dcd196134169e544bfba421..aa859bf30774ebdac7c7e414f5c75a19cc18f1f0 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_device.h
+++ b/drivers/infiniband/hw/hns/hns_roce_device.h
@@ -735,7 +735,7 @@ struct hns_roce_caps {
        u32             max_srq_sges;
        u32             max_sq_desc_sz;
        u32             max_rq_desc_sz;
-       u32             max_srq_desc_sz;
+       u32             rsv2;
        int             max_qp_init_rdma;
        int             max_qp_dest_rdma;
        u32             num_cqs;

diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
index f8b747cc4e7949b6ebccc67107c10e14ce134cb6..31bfea15cdfcfa392ceb7ccca9825f805f2460b9 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
+++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
@@ -1983,7 +1983,6 @@ static void set_default_caps(struct hns_roce_dev *hr_dev)
        caps->max_qp_dest_rdma  = HNS_ROCE_V2_MAX_QP_DEST_RDMA;
        caps->max_sq_desc_sz    = HNS_ROCE_V2_MAX_SQ_DESC_SZ;
        caps->max_rq_desc_sz    = HNS_ROCE_V2_MAX_RQ_DESC_SZ;
-       caps->max_srq_desc_sz   = HNS_ROCE_V2_MAX_SRQ_DESC_SZ;
        caps->irrl_entry_sz     = HNS_ROCE_V2_IRRL_ENTRY_SZ;
        caps->trrl_entry_sz     = HNS_ROCE_V2_EXT_ATOMIC_TRRL_ENTRY_SZ;
        caps->cqc_entry_sz      = HNS_ROCE_V2_CQC_ENTRY_SZ;
@@ -2277,7 +2276,6 @@ static int hns_roce_query_pf_caps(struct hns_roce_dev *hr_dev)
        caps->num_other_vectors      = resp_a->num_other_vectors;
        caps->max_sq_desc_sz         = resp_a->max_sq_desc_sz;
        caps->max_rq_desc_sz         = resp_a->max_rq_desc_sz;
-       caps->max_srq_desc_sz        = resp_a->max_srq_desc_sz;
        caps->cqe_sz                 = resp_a->cqe_sz;
 
        caps->mtpt_entry_sz          = resp_b->mtpt_entry_sz;

diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.h b/drivers/infiniband/hw/hns/hns_roce_hw_v2.h
index 7a613cbe2ad6c314fdc501ed039ffc143f89244d..bd09109e4848bd8e902c09bcffe608f32f2a6233 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.h
+++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.h
@@ -63,7 +63,6 @@
 #define HNS_ROCE_V2_MAX_QP_DEST_RDMA           128
 #define HNS_ROCE_V2_MAX_SQ_DESC_SZ             64
 #define HNS_ROCE_V2_MAX_RQ_DESC_SZ             16
-#define HNS_ROCE_V2_MAX_SRQ_DESC_SZ            64
 #define HNS_ROCE_V2_IRRL_ENTRY_SZ              64
 #define HNS_ROCE_V2_EXT_ATOMIC_TRRL_ENTRY_SZ   100
 #define HNS_ROCE_V2_CQC_ENTRY_SZ               64
@@ -1181,7 +1180,7 @@ struct hns_roce_query_pf_caps_a {
        u8 num_other_vectors;
        u8 max_sq_desc_sz;
        u8 max_rq_desc_sz;
-       u8 max_srq_desc_sz;
+       u8 rsv1;
        u8 cqe_sz;
 };