Initialize ib_device_ops with the supported operations using
ib_set_device_ops().
Signed-off-by: Kamal Heib <kamalheib1@xxxxxxxxx>
---
drivers/infiniband/hw/usnic/usnic_ib_main.c | 71 +++++++++++++++++------------
1 file changed, 42 insertions(+), 29 deletions(-)
diff --git a/drivers/infiniband/hw/usnic/usnic_ib_main.c b/drivers/infiniband/hw/usnic/usnic_ib_main.c
index 73bd00f8d2c8..e369072c0d89 100644
--- a/drivers/infiniband/hw/usnic/usnic_ib_main.c
+++ b/drivers/infiniband/hw/usnic/usnic_ib_main.c
@@ -330,6 +330,47 @@ static void usnic_get_dev_fw_str(struct ib_device *device, char *str)
snprintf(str, IB_FW_VERSION_NAME_MAX, "%s", info.fw_version);
}
+static const struct ib_device_ops usnic_dev_ops = {
+ /* Device operations */
+ .query_device = usnic_ib_query_device,
+ .get_dev_fw_str = usnic_get_dev_fw_str,
+ /* Port operations */
+ .query_port = usnic_ib_query_port,
+ .get_netdev = usnic_get_netdev,
+ .get_link_layer = usnic_ib_port_link_layer,
+ .get_port_immutable = usnic_port_immutable,
+ /* PKey operations */
+ .query_pkey = usnic_ib_query_pkey,
+ /* GID operations */
+ .query_gid = usnic_ib_query_gid,
+ /* PD operations */
+ .alloc_pd = usnic_ib_alloc_pd,
+ .dealloc_pd = usnic_ib_dealloc_pd,
+ /* QP operations */
+ .create_qp = usnic_ib_create_qp,
+ .modify_qp = usnic_ib_modify_qp,
+ .query_qp = usnic_ib_query_qp,
+ .destroy_qp = usnic_ib_destroy_qp,
+ .post_send = usnic_ib_post_send,
+ .post_recv = usnic_ib_post_recv,
+ /* CQ operations */
+ .create_cq = usnic_ib_create_cq,
+ .destroy_cq = usnic_ib_destroy_cq,
+ .poll_cq = usnic_ib_poll_cq,
+ .req_notify_cq = usnic_ib_req_notify_cq,
+ /* MR operations */
+ .reg_user_mr = usnic_ib_reg_mr,
+ .dereg_mr = usnic_ib_dereg_mr,
+ .get_dma_mr = usnic_ib_get_dma_mr,
+ /* Ucontext operations */
+ .alloc_ucontext = usnic_ib_alloc_ucontext,
+ .dealloc_ucontext = usnic_ib_dealloc_ucontext,
+ .mmap = usnic_ib_mmap,
+ /* AH operations */
+ .create_ah = usnic_ib_create_ah,
+ .destroy_ah = usnic_ib_destroy_ah,
+};
+
/* Start of PF discovery section */
static void *usnic_ib_device_add(struct pci_dev *dev)
{
@@ -386,35 +427,7 @@ static void *usnic_ib_device_add(struct pci_dev *dev)
(1ull << IB_USER_VERBS_CMD_DETACH_MCAST) |
(1ull << IB_USER_VERBS_CMD_OPEN_QP);
- us_ibdev->ib_dev.query_device = usnic_ib_query_device;
- us_ibdev->ib_dev.query_port = usnic_ib_query_port;
- us_ibdev->ib_dev.query_pkey = usnic_ib_query_pkey;
- us_ibdev->ib_dev.query_gid = usnic_ib_query_gid;
- us_ibdev->ib_dev.get_netdev = usnic_get_netdev;
- us_ibdev->ib_dev.get_link_layer = usnic_ib_port_link_layer;
- us_ibdev->ib_dev.alloc_pd = usnic_ib_alloc_pd;
- us_ibdev->ib_dev.dealloc_pd = usnic_ib_dealloc_pd;
- us_ibdev->ib_dev.create_qp = usnic_ib_create_qp;
- us_ibdev->ib_dev.modify_qp = usnic_ib_modify_qp;
- us_ibdev->ib_dev.query_qp = usnic_ib_query_qp;
- us_ibdev->ib_dev.destroy_qp = usnic_ib_destroy_qp;
- us_ibdev->ib_dev.create_cq = usnic_ib_create_cq;
- us_ibdev->ib_dev.destroy_cq = usnic_ib_destroy_cq;
- us_ibdev->ib_dev.reg_user_mr = usnic_ib_reg_mr;
- us_ibdev->ib_dev.dereg_mr = usnic_ib_dereg_mr;
- us_ibdev->ib_dev.alloc_ucontext = usnic_ib_alloc_ucontext;
- us_ibdev->ib_dev.dealloc_ucontext = usnic_ib_dealloc_ucontext;
- us_ibdev->ib_dev.mmap = usnic_ib_mmap;
- us_ibdev->ib_dev.create_ah = usnic_ib_create_ah;
- us_ibdev->ib_dev.destroy_ah = usnic_ib_destroy_ah;
- us_ibdev->ib_dev.post_send = usnic_ib_post_send;
- us_ibdev->ib_dev.post_recv = usnic_ib_post_recv;
- us_ibdev->ib_dev.poll_cq = usnic_ib_poll_cq;
- us_ibdev->ib_dev.req_notify_cq = usnic_ib_req_notify_cq;
- us_ibdev->ib_dev.get_dma_mr = usnic_ib_get_dma_mr;
- us_ibdev->ib_dev.get_port_immutable = usnic_port_immutable;
- us_ibdev->ib_dev.get_dev_fw_str = usnic_get_dev_fw_str;
-
+ ib_set_device_ops(&us_ibdev->ib_dev, &usnic_dev_ops);
us_ibdev->ib_dev.driver_id = RDMA_DRIVER_USNIC;
rdma_set_device_sysfs_group(&us_ibdev->ib_dev, &usnic_attr_group);
--
2.14.5
