RDMA/hns: Remove redundant parameter "mailbox" in the mailbox

The parameter "out_param" of the mailbox is always null when the context is
destroyed. So remove the function parameter "mailbox".

Link: https://lore.kernel.org/r/20220302064830.61706-4-liangwenpeng@huawei.com
Signed-off-by: Wenpeng Liang <liangwenpeng@huawei.com>
Reviewed-by: Leon Romanovsky <leonro@nvidia.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 2657f4c513eefd027233074eb2fbbe80185883a5..f21c7aa433247f087e6ae6343e914bced782b22c 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_device.h
+++ b/drivers/infiniband/hw/hns/hns_roce_device.h
@@ -1145,7 +1145,6 @@ int hns_roce_map_mr_sg(struct ib_mr *ibmr, struct scatterlist *sg, int sg_nents,
                       unsigned int *sg_offset);
 int hns_roce_dereg_mr(struct ib_mr *ibmr, struct ib_udata *udata);
 int hns_roce_hw_destroy_mpt(struct hns_roce_dev *hr_dev,
-                           struct hns_roce_cmd_mailbox *mailbox,
                            unsigned long mpt_index);
 unsigned long key_to_hw_index(u32 key);
 

diff --git a/drivers/infiniband/hw/hns/hns_roce_mr.c b/drivers/infiniband/hw/hns/hns_roce_mr.c
index bf4ea6bfff84aab910b4bf566cc348ddee005269..62a57cae800cfc317ea6b0cbe3958e8f6801a160 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_mr.c
+++ b/drivers/infiniband/hw/hns/hns_roce_mr.c
@@ -56,11 +56,10 @@ static int hns_roce_hw_create_mpt(struct hns_roce_dev *hr_dev,
 }
 
 int hns_roce_hw_destroy_mpt(struct hns_roce_dev *hr_dev,
-                           struct hns_roce_cmd_mailbox *mailbox,
                            unsigned long mpt_index)
 {
-       return hns_roce_cmd_mbox(hr_dev, 0, mailbox ? mailbox->dma : 0,
-                                mpt_index, HNS_ROCE_CMD_DESTROY_MPT);
+       return hns_roce_cmd_mbox(hr_dev, 0, 0, mpt_index,
+                                HNS_ROCE_CMD_DESTROY_MPT);
 }
 
 static int alloc_mr_key(struct hns_roce_dev *hr_dev, struct hns_roce_mr *mr)
@@ -142,7 +141,7 @@ static void hns_roce_mr_free(struct hns_roce_dev *hr_dev,
        int ret;
 
        if (mr->enabled) {
-               ret = hns_roce_hw_destroy_mpt(hr_dev, NULL,
+               ret = hns_roce_hw_destroy_mpt(hr_dev,
                                              key_to_hw_index(mr->key) &
                                              (hr_dev->caps.num_mtpts - 1));
                if (ret)
@@ -306,7 +305,7 @@ struct ib_mr *hns_roce_rereg_user_mr(struct ib_mr *ibmr, int flags, u64 start,
        if (ret)
                goto free_cmd_mbox;
 
-       ret = hns_roce_hw_destroy_mpt(hr_dev, NULL, mtpt_idx);
+       ret = hns_roce_hw_destroy_mpt(hr_dev, mtpt_idx);
        if (ret)
                ibdev_warn(ib_dev, "failed to destroy MPT, ret = %d.\n", ret);
 
@@ -477,7 +476,7 @@ static void hns_roce_mw_free(struct hns_roce_dev *hr_dev,
        int ret;
 
        if (mw->enabled) {
-               ret = hns_roce_hw_destroy_mpt(hr_dev, NULL,
+               ret = hns_roce_hw_destroy_mpt(hr_dev,
                                              key_to_hw_index(mw->rkey) &
                                              (hr_dev->caps.num_mtpts - 1));
                if (ret)

diff --git a/drivers/infiniband/hw/hns/hns_roce_srq.c b/drivers/infiniband/hw/hns/hns_roce_srq.c
index 5bb8ccea95a6aac7eb9779a2eb16b37eef102da2..1fef5d630485dfa5d9a5c217b914582891db2317 100644 (file)
--- a/drivers/infiniband/hw/hns/hns_roce_srq.c
+++ b/drivers/infiniband/hw/hns/hns_roce_srq.c
@@ -68,11 +68,9 @@ static int hns_roce_hw_create_srq(struct hns_roce_dev *dev,
 }
 
 static int hns_roce_hw_destroy_srq(struct hns_roce_dev *dev,
-                                  struct hns_roce_cmd_mailbox *mailbox,
                                   unsigned long srq_num)
 {
-       return hns_roce_cmd_mbox(dev, 0, mailbox ? mailbox->dma : 0, srq_num,
-                                HNS_ROCE_CMD_DESTROY_SRQ);
+       return hns_roce_cmd_mbox(dev, 0, 0, srq_num, HNS_ROCE_CMD_DESTROY_SRQ);
 }
 
 static int alloc_srqc(struct hns_roce_dev *hr_dev, struct hns_roce_srq *srq)
@@ -144,7 +142,7 @@ static void free_srqc(struct hns_roce_dev *hr_dev, struct hns_roce_srq *srq)
        struct hns_roce_srq_table *srq_table = &hr_dev->srq_table;
        int ret;
 
-       ret = hns_roce_hw_destroy_srq(hr_dev, NULL, srq->srqn);
+       ret = hns_roce_hw_destroy_srq(hr_dev, srq->srqn);
        if (ret)
                dev_err(hr_dev->dev, "DESTROY_SRQ failed (%d) for SRQN %06lx\n",
                        ret, srq->srqn);