[PATCH rdma-next v3 11/20] RDMA/nes: Initialize ib_device_ops struct

[Kamal Heib <kamalheib1@xxxxxxxxx>]

Initialize ib_device_ops with the supported operations using
ib_set_device_ops().

Signed-off-by: Kamal Heib <kamalheib1@xxxxxxxxx>
---
 drivers/infiniband/hw/nes/nes_verbs.c | 77 ++++++++++++++++++++---------------
 1 file changed, 45 insertions(+), 32 deletions(-)

diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
index 92d1cadd4cfd..92fe8788ccfc 100644
--- a/drivers/infiniband/hw/nes/nes_verbs.c
+++ b/drivers/infiniband/hw/nes/nes_verbs.c
@@ -3627,6 +3627,49 @@ static void get_dev_fw_str(struct ib_device *dev, char *str)
 		 (nesvnic->nesdev->nesadapter->firmware_version & 0x000000ff));
 }
 
+static const struct ib_device_ops nes_dev_ops = {
+	/* Device operations */
+	.query_device = nes_query_device,
+	.get_dev_fw_str = get_dev_fw_str,
+	/* Port operations */
+	.query_port = nes_query_port,
+	.get_port_immutable = nes_port_immutable,
+	/* PKey operations */
+	.query_pkey = nes_query_pkey,
+	/* GID operations */
+	.query_gid = nes_query_gid,
+	/* Ucontext operations */
+	.alloc_ucontext = nes_alloc_ucontext,
+	.dealloc_ucontext = nes_dealloc_ucontext,
+	.mmap = nes_mmap,
+	/* PD operations */
+	.alloc_pd = nes_alloc_pd,
+	.dealloc_pd = nes_dealloc_pd,
+	/* QP operations */
+	.create_qp = nes_create_qp,
+	.modify_qp = nes_modify_qp,
+	.query_qp = nes_query_qp,
+	.destroy_qp = nes_destroy_qp,
+	.post_send = nes_post_send,
+	.post_recv = nes_post_recv,
+	.drain_sq = nes_drain_sq,
+	.drain_rq = nes_drain_rq,
+	/* CQ operations */
+	.create_cq = nes_create_cq,
+	.destroy_cq = nes_destroy_cq,
+	.poll_cq = nes_poll_cq,
+	.req_notify_cq = nes_req_notify_cq,
+	/* MR operations */
+	.get_dma_mr = nes_get_dma_mr,
+	.reg_user_mr = nes_reg_user_mr,
+	.dereg_mr = nes_dereg_mr,
+	.alloc_mr = nes_alloc_mr,
+	.map_mr_sg = nes_map_mr_sg,
+	/* MW operations */
+	.alloc_mw = nes_alloc_mw,
+	.dealloc_mw = nes_dealloc_mw,
+};
+
 /**
  * nes_init_ofa_device
  */
@@ -3673,36 +3716,6 @@ struct nes_ib_device *nes_init_ofa_device(struct net_device *netdev)
 	nesibdev->ibdev.phys_port_cnt = 1;
 	nesibdev->ibdev.num_comp_vectors = 1;
 	nesibdev->ibdev.dev.parent = &nesdev->pcidev->dev;
-	nesibdev->ibdev.query_device = nes_query_device;
-	nesibdev->ibdev.query_port = nes_query_port;
-	nesibdev->ibdev.query_pkey = nes_query_pkey;
-	nesibdev->ibdev.query_gid = nes_query_gid;
-	nesibdev->ibdev.alloc_ucontext = nes_alloc_ucontext;
-	nesibdev->ibdev.dealloc_ucontext = nes_dealloc_ucontext;
-	nesibdev->ibdev.mmap = nes_mmap;
-	nesibdev->ibdev.alloc_pd = nes_alloc_pd;
-	nesibdev->ibdev.dealloc_pd = nes_dealloc_pd;
-	nesibdev->ibdev.create_qp = nes_create_qp;
-	nesibdev->ibdev.modify_qp = nes_modify_qp;
-	nesibdev->ibdev.query_qp = nes_query_qp;
-	nesibdev->ibdev.destroy_qp = nes_destroy_qp;
-	nesibdev->ibdev.create_cq = nes_create_cq;
-	nesibdev->ibdev.destroy_cq = nes_destroy_cq;
-	nesibdev->ibdev.poll_cq = nes_poll_cq;
-	nesibdev->ibdev.get_dma_mr = nes_get_dma_mr;
-	nesibdev->ibdev.reg_user_mr = nes_reg_user_mr;
-	nesibdev->ibdev.dereg_mr = nes_dereg_mr;
-	nesibdev->ibdev.alloc_mw = nes_alloc_mw;
-	nesibdev->ibdev.dealloc_mw = nes_dealloc_mw;
-
-	nesibdev->ibdev.alloc_mr = nes_alloc_mr;
-	nesibdev->ibdev.map_mr_sg = nes_map_mr_sg;
-
-	nesibdev->ibdev.req_notify_cq = nes_req_notify_cq;
-	nesibdev->ibdev.post_send = nes_post_send;
-	nesibdev->ibdev.post_recv = nes_post_recv;
-	nesibdev->ibdev.drain_sq = nes_drain_sq;
-	nesibdev->ibdev.drain_rq = nes_drain_rq;
 
 	nesibdev->ibdev.iwcm = kzalloc(sizeof(*nesibdev->ibdev.iwcm), GFP_KERNEL);
 	if (nesibdev->ibdev.iwcm == NULL) {
@@ -3717,8 +3730,8 @@ struct nes_ib_device *nes_init_ofa_device(struct net_device *netdev)
 	nesibdev->ibdev.iwcm->reject = nes_reject;
 	nesibdev->ibdev.iwcm->create_listen = nes_create_listen;
 	nesibdev->ibdev.iwcm->destroy_listen = nes_destroy_listen;
-	nesibdev->ibdev.get_port_immutable   = nes_port_immutable;
-	nesibdev->ibdev.get_dev_fw_str   = get_dev_fw_str;
+
+	ib_set_device_ops(&nesibdev->ibdev, &nes_dev_ops);
 	memcpy(nesibdev->ibdev.iwcm->ifname, netdev->name,
 	       sizeof(nesibdev->ibdev.iwcm->ifname));
 
-- 
2.14.5