IB/{rdmavt, hfi1, qib}: Remove get_card_name() downcall

rdmavt has a down call to client drivers to retrieve a crafted card
name.

This name should be the IB defined name.

Rather than craft the name each time it is needed, simply retrieve
the IB allocated name from the IB device.

Update the function name to reflect its application.

Clean up driver code to match this change.

Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Michael J. Ruhl <michael.j.ruhl@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/hw/hfi1/driver.c b/drivers/infiniband/hw/hfi1/driver.c
index 4f65ac6..4561719 100644 (file)
--- a/drivers/infiniband/hw/hfi1/driver.c
+++ b/drivers/infiniband/hw/hfi1/driver.c
@@ -167,14 +167,6 @@ const char *get_unit_name(int unit)
        return iname;
 }
 
-const char *get_card_name(struct rvt_dev_info *rdi)
-{
-       struct hfi1_ibdev *ibdev = container_of(rdi, struct hfi1_ibdev, rdi);
-       struct hfi1_devdata *dd = container_of(ibdev,
-                                              struct hfi1_devdata, verbs_dev);
-       return get_unit_name(dd->unit);
-}
-
 struct pci_dev *get_pci_dev(struct rvt_dev_info *rdi)
 {
        struct hfi1_ibdev *ibdev = container_of(rdi, struct hfi1_ibdev, rdi);

diff --git a/drivers/infiniband/hw/hfi1/hfi.h b/drivers/infiniband/hw/hfi1/hfi.h
index 99921ac..0709aba 100644 (file)
--- a/drivers/infiniband/hw/hfi1/hfi.h
+++ b/drivers/infiniband/hw/hfi1/hfi.h
@@ -1972,7 +1972,6 @@ int get_platform_config_field(struct hfi1_devdata *dd,
                              u32 *data, u32 len);
 
 const char *get_unit_name(int unit);
-const char *get_card_name(struct rvt_dev_info *rdi);
 struct pci_dev *get_pci_dev(struct rvt_dev_info *rdi);
 
 /*

diff --git a/drivers/infiniband/hw/hfi1/verbs.c b/drivers/infiniband/hw/hfi1/verbs.c
index 4e68e3f..b8776a3 100644 (file)
--- a/drivers/infiniband/hw/hfi1/verbs.c
+++ b/drivers/infiniband/hw/hfi1/verbs.c
@@ -1890,7 +1890,6 @@ int hfi1_register_ib_device(struct hfi1_devdata *dd)
         * Fill in rvt info object.
         */
        dd->verbs_dev.rdi.driver_f.port_callback = hfi1_create_port_files;
-       dd->verbs_dev.rdi.driver_f.get_card_name = get_card_name;
        dd->verbs_dev.rdi.driver_f.get_pci_dev = get_pci_dev;
        dd->verbs_dev.rdi.driver_f.check_ah = hfi1_check_ah;
        dd->verbs_dev.rdi.driver_f.notify_new_ah = hfi1_notify_new_ah;

diff --git a/drivers/infiniband/hw/qib/qib.h b/drivers/infiniband/hw/qib/qib.h
index 092ed81..34c5254 100644 (file)
--- a/drivers/infiniband/hw/qib/qib.h
+++ b/drivers/infiniband/hw/qib/qib.h
@@ -1429,7 +1429,6 @@ u64 qib_sps_ints(void);
 dma_addr_t qib_map_page(struct pci_dev *, struct page *, unsigned long,
                          size_t, int);
 const char *qib_get_unit_name(int unit);
-const char *qib_get_card_name(struct rvt_dev_info *rdi);
 struct pci_dev *qib_get_pci_dev(struct rvt_dev_info *rdi);
 
 /*

diff --git a/drivers/infiniband/hw/qib/qib_driver.c b/drivers/infiniband/hw/qib/qib_driver.c
index 33d3335..9b13680 100644 (file)
--- a/drivers/infiniband/hw/qib/qib_driver.c
+++ b/drivers/infiniband/hw/qib/qib_driver.c
@@ -89,14 +89,6 @@ const char *qib_get_unit_name(int unit)
        return iname;
 }
 
-const char *qib_get_card_name(struct rvt_dev_info *rdi)
-{
-       struct qib_ibdev *ibdev = container_of(rdi, struct qib_ibdev, rdi);
-       struct qib_devdata *dd = container_of(ibdev,
-                                             struct qib_devdata, verbs_dev);
-       return qib_get_unit_name(dd->unit);
-}
-
 struct pci_dev *qib_get_pci_dev(struct rvt_dev_info *rdi)
 {
        struct qib_ibdev *ibdev = container_of(rdi, struct qib_ibdev, rdi);

diff --git a/drivers/infiniband/hw/qib/qib_verbs.c b/drivers/infiniband/hw/qib/qib_verbs.c
index 373b80b..fabee76 100644 (file)
--- a/drivers/infiniband/hw/qib/qib_verbs.c
+++ b/drivers/infiniband/hw/qib/qib_verbs.c
@@ -1585,7 +1585,6 @@ int qib_register_ib_device(struct qib_devdata *dd)
         * Fill in rvt info object.
         */
        dd->verbs_dev.rdi.driver_f.port_callback = qib_create_port_files;
-       dd->verbs_dev.rdi.driver_f.get_card_name = qib_get_card_name;
        dd->verbs_dev.rdi.driver_f.get_pci_dev = qib_get_pci_dev;
        dd->verbs_dev.rdi.driver_f.check_ah = qib_check_ah;
        dd->verbs_dev.rdi.driver_f.check_send_wqe = qib_check_send_wqe;

diff --git a/drivers/infiniband/sw/rdmavt/trace.h b/drivers/infiniband/sw/rdmavt/trace.h
index bb4b1e7..36ddbd2 100644 (file)
--- a/drivers/infiniband/sw/rdmavt/trace.h
+++ b/drivers/infiniband/sw/rdmavt/trace.h
@@ -45,8 +45,8 @@
  *
  */
 
-#define RDI_DEV_ENTRY(rdi)   __string(dev, rdi->driver_f.get_card_name(rdi))
-#define RDI_DEV_ASSIGN(rdi)  __assign_str(dev, rdi->driver_f.get_card_name(rdi))
+#define RDI_DEV_ENTRY(rdi)   __string(dev, rvt_get_ibdev_name(rdi))
+#define RDI_DEV_ASSIGN(rdi)  __assign_str(dev, rvt_get_ibdev_name(rdi))
 
 #include "trace_rvt.h"
 #include "trace_qp.h"

diff --git a/drivers/infiniband/sw/rdmavt/vt.c b/drivers/infiniband/sw/rdmavt/vt.c
index 64bdd44..088fb2d 100644 (file)
--- a/drivers/infiniband/sw/rdmavt/vt.c
+++ b/drivers/infiniband/sw/rdmavt/vt.c
@@ -413,7 +413,6 @@ static noinline int check_support(struct rvt_dev_info *rdi, int verb)
                 * required for rdmavt to function.
                 */
                if ((!rdi->driver_f.port_callback) ||
-                   (!rdi->driver_f.get_card_name) ||
                    (!rdi->driver_f.get_pci_dev))
                        return -EINVAL;
                break;

diff --git a/drivers/infiniband/sw/rdmavt/vt.h b/drivers/infiniband/sw/rdmavt/vt.h
index f363505..8823b2e 100644 (file)
--- a/drivers/infiniband/sw/rdmavt/vt.h
+++ b/drivers/infiniband/sw/rdmavt/vt.h
@@ -63,19 +63,19 @@
 
 #define rvt_pr_info(rdi, fmt, ...) \
        __rvt_pr_info(rdi->driver_f.get_pci_dev(rdi), \
-                     rdi->driver_f.get_card_name(rdi), \
+                     rvt_get_ibdev_name(rdi), \
                      fmt, \
                      ##__VA_ARGS__)
 
 #define rvt_pr_warn(rdi, fmt, ...) \
        __rvt_pr_warn(rdi->driver_f.get_pci_dev(rdi), \
-                     rdi->driver_f.get_card_name(rdi), \
+                     rvt_get_ibdev_name(rdi), \
                      fmt, \
                      ##__VA_ARGS__)
 
 #define rvt_pr_err(rdi, fmt, ...) \
        __rvt_pr_err(rdi->driver_f.get_pci_dev(rdi), \
-                    rdi->driver_f.get_card_name(rdi), \
+                    rvt_get_ibdev_name(rdi), \
                     fmt, \
                     ##__VA_ARGS__)
 

diff --git a/include/rdma/rdma_vt.h b/include/rdma/rdma_vt.h
index b57784e..4118324 100644 (file)
--- a/include/rdma/rdma_vt.h
+++ b/include/rdma/rdma_vt.h
@@ -228,13 +228,6 @@ struct rvt_driver_provided {
        int (*port_callback)(struct ib_device *, u8, struct kobject *);
 
        /*
-        * Returns a string to represent the device for which is being
-        * registered. This is primarily used for error and debug messages on
-        * the console.
-        */
-       const char * (*get_card_name)(struct rvt_dev_info *rdi);
-
-       /*
         * Returns a pointer to the undelying hardware's PCI device. This is
         * used to display information as to what hardware is being referenced
         * in an output message
@@ -432,6 +425,17 @@ static inline void rvt_set_ibdev_name(struct rvt_dev_info *rdi,
        snprintf(rdi->ibdev.name, sizeof(rdi->ibdev.name), fmt, name, unit);
 }
 
+/**
+ * rvt_get_ibdev_name - return the IB name
+ * @rdi: rdmavt device
+ *
+ * Return the registered name of the device.
+ */
+static inline const char *rvt_get_ibdev_name(const struct rvt_dev_info *rdi)
+{
+       return rdi->ibdev.name;
+}
+
 static inline struct rvt_pd *ibpd_to_rvtpd(struct ib_pd *ibpd)
 {
        return container_of(ibpd, struct rvt_pd, ibpd);