IB/rdmavt: Move driver helper functions to a common structure

Drivers are going to need to provide multiple functions for rdmavt to
call in to. We already have one, so go ahead and push this into a
data structure designated for driver supplied functions.

Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Reviewed-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/sw/rdmavt/vt.c b/drivers/infiniband/sw/rdmavt/vt.c
index 367bc45e06e7dd73bbb25a3e15009df43cc045fb..b4ce97e6ff12497048f8059349d33306affbed64 100644 (file)
--- a/drivers/infiniband/sw/rdmavt/vt.c
+++ b/drivers/infiniband/sw/rdmavt/vt.c
@@ -280,8 +280,12 @@ int rvt_register_device(struct rvt_dev_info *rdi)
        spin_lock_init(&rdi->n_pds_lock);
        rdi->n_pds_allocated = 0;
 
+       /* Validate that drivers have provided the right functions */
+       if (!rdi->driver_f.port_callback)
+               return -EINVAL;
+
        /* We are now good to announce we exist */
-       return ib_register_device(&rdi->ibdev, rdi->port_callback);
+       return ib_register_device(&rdi->ibdev, rdi->driver_f.port_callback);
 }
 EXPORT_SYMBOL(rvt_register_device);
 

diff --git a/include/rdma/rdma_vt.h b/include/rdma/rdma_vt.h
index 9baa7f04e8d061698eb9540d4f13f5cab63a1a15..e0beedc6110ebf88b272fd2e7d9667626c4a9cdd 100644 (file)
--- a/include/rdma/rdma_vt.h
+++ b/include/rdma/rdma_vt.h
@@ -383,6 +383,19 @@ struct rvt_driver_params {
         */
 };
 
+/*
+ * Functions that drivers are required to support
+ */
+struct rvt_driver_provided {
+       /*
+        * The work to create port files in /sys/class Infiniband is different
+        * depending on the driver. This should not be extracted away and
+        * instead drivers are responsible for setting the correct callback for
+        * this.
+        */
+       int (*port_callback)(struct ib_device *, u8, struct kobject *);
+};
+
 /* Protection domain */
 struct rvt_pd {
        struct ib_pd ibpd;
@@ -407,13 +420,8 @@ struct rvt_dev_info {
 
        /* PKey Table goes here */
 
-       /*
-        * The work to create port files in /sys/class Infiniband is different
-        * depending on the driver. This should not be extracted away and
-        * instead drivers are responsible for setting the correct callback for
-        * this.
-        */
-       int (*port_callback)(struct ib_device *, u8, struct kobject *);
+       /* Driver specific helper functions */
+       struct rvt_driver_provided driver_f;
 
        /* Internal use */
        int n_pds_allocated;