RDMA/ulp: Use dev_name instead of ibdev->name

These return the same thing but dev_name is a more conventional use of the
kernel API.

Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
Reviewed-by: Steve Wise <swise@opengridcomputing.com>
Reviewed-by: Sagi Grimberg <sagi@grimberg.me>
Reviewed-by: Dennis Dalessandro <dennis.dalessandro@intel.com>

diff --git a/drivers/infiniband/ulp/ipoib/ipoib_verbs.c b/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
index 9f36ca786df849d52bbe6de5c65556b92703830c..1e88213459f2f093eed58f53b3a15a6e29bfb112 100644 (file)
--- a/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
+++ b/drivers/infiniband/ulp/ipoib/ipoib_verbs.c
@@ -277,7 +277,7 @@ void ipoib_event(struct ib_event_handler *handler,
                return;
 
        ipoib_dbg(priv, "Event %d on device %s port %d\n", record->event,
-                 record->device->name, record->element.port_num);
+                 dev_name(&record->device->dev), record->element.port_num);
 
        if (record->event == IB_EVENT_SM_CHANGE ||
            record->event == IB_EVENT_CLIENT_REREGISTER) {

diff --git a/drivers/infiniband/ulp/iser/iser_verbs.c b/drivers/infiniband/ulp/iser/iser_verbs.c
index b686a4aaffe8663b8ca6b78078a04860d047234d..946b623ba5eb7f693469c90fdbd32c7f76bd3b2e 100644 (file)
--- a/drivers/infiniband/ulp/iser/iser_verbs.c
+++ b/drivers/infiniband/ulp/iser/iser_verbs.c
@@ -55,7 +55,7 @@ static void iser_event_handler(struct ib_event_handler *handler,
 {
        iser_err("async event %s (%d) on device %s port %d\n",
                 ib_event_msg(event->event), event->event,
-                event->device->name, event->element.port_num);
+               dev_name(&event->device->dev), event->element.port_num);
 }
 
 /**
@@ -85,7 +85,7 @@ static int iser_create_device_ib_res(struct iser_device *device)
        max_cqe = min(ISER_MAX_CQ_LEN, ib_dev->attrs.max_cqe);
 
        iser_info("using %d CQs, device %s supports %d vectors max_cqe %d\n",
-                 device->comps_used, ib_dev->name,
+                 device->comps_used, dev_name(&ib_dev->dev),
                  ib_dev->num_comp_vectors, max_cqe);
 
        device->pd = ib_alloc_pd(ib_dev,
@@ -468,7 +468,8 @@ static int iser_create_ib_conn_res(struct ib_conn *ib_conn)
                        iser_conn->max_cmds =
                                ISER_GET_MAX_XMIT_CMDS(ib_dev->attrs.max_qp_wr);
                        iser_dbg("device %s supports max_send_wr %d\n",
-                                device->ib_device->name, ib_dev->attrs.max_qp_wr);
+                                dev_name(&device->ib_device->dev),
+                                ib_dev->attrs.max_qp_wr);
                }
        }
 
@@ -764,7 +765,7 @@ static void iser_addr_handler(struct rdma_cm_id *cma_id)
                      IB_DEVICE_SIGNATURE_HANDOVER)) {
                        iser_warn("T10-PI requested but not supported on %s, "
                                  "continue without T10-PI\n",
-                                 ib_conn->device->ib_device->name);
+                                 dev_name(&ib_conn->device->ib_device->dev));
                        ib_conn->pi_support = false;
                } else {
                        ib_conn->pi_support = true;

diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c
index f39670c5c25c57de945b6e5d454707800374b385..e3dd13798d79ef43f200213273400c46e4675561 100644 (file)
--- a/drivers/infiniband/ulp/isert/ib_isert.c
+++ b/drivers/infiniband/ulp/isert/ib_isert.c
@@ -262,7 +262,7 @@ isert_alloc_comps(struct isert_device *device)
 
        isert_info("Using %d CQs, %s supports %d vectors support "
                   "pi_capable %d\n",
-                  device->comps_used, device->ib_device->name,
+                  device->comps_used, dev_name(&device->ib_device->dev),
                   device->ib_device->num_comp_vectors,
                   device->pi_capable);
 

diff --git a/drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c b/drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c
index 15711dcc6f58567ffebbc9312cd6df910294f31a..d119d9afa845a745fc637e1c81d8c4c9f2e7a31c 100644 (file)
--- a/drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c
+++ b/drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c
@@ -888,7 +888,8 @@ static void opa_vnic_event(struct ib_event_handler *handler,
                return;
 
        c_dbg("OPA_VNIC received event %d on device %s port %d\n",
-             record->event, record->device->name, record->element.port_num);
+             record->event, dev_name(&record->device->dev),
+             record->element.port_num);
 
        if (record->event == IB_EVENT_PORT_ERR)
                idr_for_each(&port->vport_idr, vema_disable_vport, NULL);

diff --git a/drivers/infiniband/ulp/srp/ib_srp.c b/drivers/infiniband/ulp/srp/ib_srp.c
index 444d16520506a1773f01dc0b89087091d867e939..e2ad7c5ea2961f01d751d9a8e730f827e1922122 100644 (file)
--- a/drivers/infiniband/ulp/srp/ib_srp.c
+++ b/drivers/infiniband/ulp/srp/ib_srp.c
@@ -3124,7 +3124,8 @@ static ssize_t show_local_ib_device(struct device *dev,
 {
        struct srp_target_port *target = host_to_target(class_to_shost(dev));
 
-       return sprintf(buf, "%s\n", target->srp_host->srp_dev->dev->name);
+       return sprintf(buf, "%s\n",
+                      dev_name(&target->srp_host->srp_dev->dev->dev));
 }
 
 static ssize_t show_ch_count(struct device *dev, struct device_attribute *attr,
@@ -3987,7 +3988,7 @@ static ssize_t show_ibdev(struct device *dev, struct device_attribute *attr,
 {
        struct srp_host *host = container_of(dev, struct srp_host, dev);
 
-       return sprintf(buf, "%s\n", host->srp_dev->dev->name);
+       return sprintf(buf, "%s\n", dev_name(&host->srp_dev->dev->dev));
 }
 
 static DEVICE_ATTR(ibdev, S_IRUGO, show_ibdev, NULL);
@@ -4019,7 +4020,8 @@ static struct srp_host *srp_add_port(struct srp_device *device, u8 port)
 
        host->dev.class = &srp_class;
        host->dev.parent = device->dev->dev.parent;
-       dev_set_name(&host->dev, "srp-%s-%d", device->dev->name, port);
+       dev_set_name(&host->dev, "srp-%s-%d", dev_name(&device->dev->dev),
+                    port);
 
        if (device_register(&host->dev))
                goto free_host;
@@ -4095,7 +4097,7 @@ static void srp_add_one(struct ib_device *device)
        srp_dev->mr_max_size    = srp_dev->mr_page_size *
                                   srp_dev->max_pages_per_mr;
        pr_debug("%s: mr_page_shift = %d, device->max_mr_size = %#llx, device->max_fast_reg_page_list_len = %u, max_pages_per_mr = %d, mr_max_size = %#x\n",
-                device->name, mr_page_shift, attr->max_mr_size,
+                dev_name(&device->dev), mr_page_shift, attr->max_mr_size,
                 attr->max_fast_reg_page_list_len,
                 srp_dev->max_pages_per_mr, srp_dev->mr_max_size);
 

diff --git a/drivers/infiniband/ulp/srpt/ib_srpt.c b/drivers/infiniband/ulp/srpt/ib_srpt.c
index 447d21ea479afcc815e7f5b6a1fa1e0435d86aab..2357aa727dcf593336ee3d92c7547c2f3afbf86b 100644 (file)
--- a/drivers/infiniband/ulp/srpt/ib_srpt.c
+++ b/drivers/infiniband/ulp/srpt/ib_srpt.c
@@ -148,7 +148,7 @@ static void srpt_event_handler(struct ib_event_handler *handler,
                return;
 
        pr_debug("ASYNC event= %d on device= %s\n", event->event,
-                sdev->device->name);
+                dev_name(&sdev->device->dev));
 
        switch (event->event) {
        case IB_EVENT_PORT_ERR:
@@ -1941,7 +1941,8 @@ static void __srpt_close_all_ch(struct srpt_port *sport)
                        if (srpt_disconnect_ch(ch) >= 0)
                                pr_info("Closing channel %s because target %s_%d has been disabled\n",
                                        ch->sess_name,
-                                       sport->sdev->device->name, sport->port);
+                                       dev_name(&sport->sdev->device->dev),
+                                       sport->port);
                        srpt_close_ch(ch);
                }
        }
@@ -2127,7 +2128,7 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev,
        if (!sport->enabled) {
                rej->reason = cpu_to_be32(SRP_LOGIN_REJ_INSUFFICIENT_RESOURCES);
                pr_info("rejected SRP_LOGIN_REQ because target port %s_%d has not yet been enabled\n",
-                       sport->sdev->device->name, port_num);
+                       dev_name(&sport->sdev->device->dev), port_num);
                goto reject;
        }
 
@@ -2267,7 +2268,7 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev,
                rej->reason = cpu_to_be32(
                                SRP_LOGIN_REJ_INSUFFICIENT_RESOURCES);
                pr_info("rejected SRP_LOGIN_REQ because target %s_%d is not enabled\n",
-                       sdev->device->name, port_num);
+                       dev_name(&sdev->device->dev), port_num);
                mutex_unlock(&sport->mutex);
                goto reject;
        }
@@ -2842,7 +2843,7 @@ static int srpt_release_sport(struct srpt_port *sport)
        while (wait_event_timeout(sport->ch_releaseQ,
                                  srpt_ch_list_empty(sport), 5 * HZ) <= 0) {
                pr_info("%s_%d: waiting for session unregistration ...\n",
-                       sport->sdev->device->name, sport->port);
+                       dev_name(&sport->sdev->device->dev), sport->port);
                rcu_read_lock();
                list_for_each_entry(nexus, &sport->nexus_list, entry) {
                        list_for_each_entry(ch, &nexus->ch_list, list) {
@@ -2932,7 +2933,7 @@ static int srpt_alloc_srq(struct srpt_device *sdev)
        }
 
        pr_debug("create SRQ #wr= %d max_allow=%d dev= %s\n", sdev->srq_size,
-                sdev->device->attrs.max_srq_wr, device->name);
+                sdev->device->attrs.max_srq_wr, dev_name(&device->dev));
 
        sdev->ioctx_ring = (struct srpt_recv_ioctx **)
                srpt_alloc_ioctx_ring(sdev, sdev->srq_size,
@@ -2965,8 +2966,8 @@ static int srpt_use_srq(struct srpt_device *sdev, bool use_srq)
        } else if (use_srq && !sdev->srq) {
                ret = srpt_alloc_srq(sdev);
        }
-       pr_debug("%s(%s): use_srq = %d; ret = %d\n", __func__, device->name,
-                sdev->use_srq, ret);
+       pr_debug("%s(%s): use_srq = %d; ret = %d\n", __func__,
+                dev_name(&device->dev), sdev->use_srq, ret);
        return ret;
 }
 
@@ -3052,7 +3053,7 @@ static void srpt_add_one(struct ib_device *device)
 
                if (srpt_refresh_port(sport)) {
                        pr_err("MAD registration failed for %s-%d.\n",
-                              sdev->device->name, i);
+                              dev_name(&sdev->device->dev), i);
                        goto err_event;
                }
        }
@@ -3063,7 +3064,7 @@ static void srpt_add_one(struct ib_device *device)
 
 out:
        ib_set_client_data(device, &srpt_client, sdev);
-       pr_debug("added %s.\n", device->name);
+       pr_debug("added %s.\n", dev_name(&device->dev));
        return;
 
 err_event:
@@ -3078,7 +3079,7 @@ free_dev:
        kfree(sdev);
 err:
        sdev = NULL;
-       pr_info("%s(%s) failed.\n", __func__, device->name);
+       pr_info("%s(%s) failed.\n", __func__, dev_name(&device->dev));
        goto out;
 }
 
@@ -3093,7 +3094,8 @@ static void srpt_remove_one(struct ib_device *device, void *client_data)
        int i;
 
        if (!sdev) {
-               pr_info("%s(%s): nothing to do.\n", __func__, device->name);
+               pr_info("%s(%s): nothing to do.\n", __func__,
+                       dev_name(&device->dev));
                return;
        }
 

diff --git a/include/rdma/rdma_vt.h b/include/rdma/rdma_vt.h
index 065c9fbe6589954d8af53dbfe113dc3f52f0058a..cc08de3570b4fc2d1b366ca526904e159317727f 100644 (file)
--- a/include/rdma/rdma_vt.h
+++ b/include/rdma/rdma_vt.h
@@ -447,7 +447,7 @@ static inline void rvt_set_ibdev_name(struct rvt_dev_info *rdi,
  */
 static inline const char *rvt_get_ibdev_name(const struct rvt_dev_info *rdi)
 {
-       return rdi->ibdev.name;
+       return dev_name(&rdi->ibdev.dev);
 }
 
 static inline struct rvt_pd *ibpd_to_rvtpd(struct ib_pd *ibpd)