Skip to content

Commit 6c85411

Browse files
jgunthorpejgunthorpe
committed
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>
1 parent 9de6986 commit 6c85411

File tree

7 files changed

+30
-24
lines changed

7 files changed

+30
-24
lines changed

‎drivers/infiniband/ulp/ipoib/ipoib_verbs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ void ipoib_event(struct ib_event_handler *handler,
277277
return;
278278

279279
ipoib_dbg(priv, "Event %d on device %s port %d\n", record->event,
280-
record->device->name, record->element.port_num);
280+
dev_name(&record->device->dev), record->element.port_num);
281281

282282
if (record->event == IB_EVENT_SM_CHANGE ||
283283
record->event == IB_EVENT_CLIENT_REREGISTER) {

‎drivers/infiniband/ulp/iser/iser_verbs.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ static void iser_event_handler(struct ib_event_handler *handler,
5555
{
5656
iser_err("async event %s (%d) on device %s port %d\n",
5757
ib_event_msg(event->event), event->event,
58-
event->device->name, event->element.port_num);
58+
dev_name(&event->device->dev), event->element.port_num);
5959
}
6060

6161
/**
@@ -85,7 +85,7 @@ static int iser_create_device_ib_res(struct iser_device *device)
8585
max_cqe = min(ISER_MAX_CQ_LEN, ib_dev->attrs.max_cqe);
8686

8787
iser_info("using %d CQs, device %s supports %d vectors max_cqe %d\n",
88-
device->comps_used, ib_dev->name,
88+
device->comps_used, dev_name(&ib_dev->dev),
8989
ib_dev->num_comp_vectors, max_cqe);
9090

9191
device->pd = ib_alloc_pd(ib_dev,
@@ -468,7 +468,8 @@ static int iser_create_ib_conn_res(struct ib_conn *ib_conn)
468468
iser_conn->max_cmds =
469469
ISER_GET_MAX_XMIT_CMDS(ib_dev->attrs.max_qp_wr);
470470
iser_dbg("device %s supports max_send_wr %d\n",
471-
device->ib_device->name, ib_dev->attrs.max_qp_wr);
471+
dev_name(&device->ib_device->dev),
472+
ib_dev->attrs.max_qp_wr);
472473
}
473474
}
474475

@@ -764,7 +765,7 @@ static void iser_addr_handler(struct rdma_cm_id *cma_id)
764765
IB_DEVICE_SIGNATURE_HANDOVER)) {
765766
iser_warn("T10-PI requested but not supported on %s, "
766767
"continue without T10-PI\n",
767-
ib_conn->device->ib_device->name);
768+
dev_name(&ib_conn->device->ib_device->dev));
768769
ib_conn->pi_support = false;
769770
} else {
770771
ib_conn->pi_support = true;

‎drivers/infiniband/ulp/isert/ib_isert.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ isert_alloc_comps(struct isert_device *device)
262262

263263
isert_info("Using %d CQs, %s supports %d vectors support "
264264
"pi_capable %d\n",
265-
device->comps_used, device->ib_device->name,
265+
device->comps_used, dev_name(&device->ib_device->dev),
266266
device->ib_device->num_comp_vectors,
267267
device->pi_capable);
268268

‎drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -888,7 +888,8 @@ static void opa_vnic_event(struct ib_event_handler *handler,
888888
return;
889889

890890
c_dbg("OPA_VNIC received event %d on device %s port %d\n",
891-
record->event, record->device->name, record->element.port_num);
891+
record->event, dev_name(&record->device->dev),
892+
record->element.port_num);
892893

893894
if (record->event == IB_EVENT_PORT_ERR)
894895
idr_for_each(&port->vport_idr, vema_disable_vport, NULL);

‎drivers/infiniband/ulp/srp/ib_srp.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3124,7 +3124,8 @@ static ssize_t show_local_ib_device(struct device *dev,
31243124
{
31253125
struct srp_target_port *target = host_to_target(class_to_shost(dev));
31263126

3127-
return sprintf(buf, "%s\n", target->srp_host->srp_dev->dev->name);
3127+
return sprintf(buf, "%s\n",
3128+
dev_name(&target->srp_host->srp_dev->dev->dev));
31283129
}
31293130

31303131
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,
39873988
{
39883989
struct srp_host *host = container_of(dev, struct srp_host, dev);
39893990

3990-
return sprintf(buf, "%s\n", host->srp_dev->dev->name);
3991+
return sprintf(buf, "%s\n", dev_name(&host->srp_dev->dev->dev));
39913992
}
39923993

39933994
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)
40194020

40204021
host->dev.class = &srp_class;
40214022
host->dev.parent = device->dev->dev.parent;
4022-
dev_set_name(&host->dev, "srp-%s-%d", device->dev->name, port);
4023+
dev_set_name(&host->dev, "srp-%s-%d", dev_name(&device->dev->dev),
4024+
port);
40234025

40244026
if (device_register(&host->dev))
40254027
goto free_host;
@@ -4095,7 +4097,7 @@ static void srp_add_one(struct ib_device *device)
40954097
srp_dev->mr_max_size = srp_dev->mr_page_size *
40964098
srp_dev->max_pages_per_mr;
40974099
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",
4098-
device->name, mr_page_shift, attr->max_mr_size,
4100+
dev_name(&device->dev), mr_page_shift, attr->max_mr_size,
40994101
attr->max_fast_reg_page_list_len,
41004102
srp_dev->max_pages_per_mr, srp_dev->mr_max_size);
41014103

‎drivers/infiniband/ulp/srpt/ib_srpt.c

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ static void srpt_event_handler(struct ib_event_handler *handler,
148148
return;
149149

150150
pr_debug("ASYNC event= %d on device= %s\n", event->event,
151-
sdev->device->name);
151+
dev_name(&sdev->device->dev));
152152

153153
switch (event->event) {
154154
case IB_EVENT_PORT_ERR:
@@ -1941,7 +1941,8 @@ static void __srpt_close_all_ch(struct srpt_port *sport)
19411941
if (srpt_disconnect_ch(ch) >= 0)
19421942
pr_info("Closing channel %s because target %s_%d has been disabled\n",
19431943
ch->sess_name,
1944-
sport->sdev->device->name, sport->port);
1944+
dev_name(&sport->sdev->device->dev),
1945+
sport->port);
19451946
srpt_close_ch(ch);
19461947
}
19471948
}
@@ -2127,7 +2128,7 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev,
21272128
if (!sport->enabled) {
21282129
rej->reason = cpu_to_be32(SRP_LOGIN_REJ_INSUFFICIENT_RESOURCES);
21292130
pr_info("rejected SRP_LOGIN_REQ because target port %s_%d has not yet been enabled\n",
2130-
sport->sdev->device->name, port_num);
2131+
dev_name(&sport->sdev->device->dev), port_num);
21312132
goto reject;
21322133
}
21332134

@@ -2267,7 +2268,7 @@ static int srpt_cm_req_recv(struct srpt_device *const sdev,
22672268
rej->reason = cpu_to_be32(
22682269
SRP_LOGIN_REJ_INSUFFICIENT_RESOURCES);
22692270
pr_info("rejected SRP_LOGIN_REQ because target %s_%d is not enabled\n",
2270-
sdev->device->name, port_num);
2271+
dev_name(&sdev->device->dev), port_num);
22712272
mutex_unlock(&sport->mutex);
22722273
goto reject;
22732274
}
@@ -2842,7 +2843,7 @@ static int srpt_release_sport(struct srpt_port *sport)
28422843
while (wait_event_timeout(sport->ch_releaseQ,
28432844
srpt_ch_list_empty(sport), 5 * HZ) <= 0) {
28442845
pr_info("%s_%d: waiting for session unregistration ...\n",
2845-
sport->sdev->device->name, sport->port);
2846+
dev_name(&sport->sdev->device->dev), sport->port);
28462847
rcu_read_lock();
28472848
list_for_each_entry(nexus, &sport->nexus_list, entry) {
28482849
list_for_each_entry(ch, &nexus->ch_list, list) {
@@ -2932,7 +2933,7 @@ static int srpt_alloc_srq(struct srpt_device *sdev)
29322933
}
29332934

29342935
pr_debug("create SRQ #wr= %d max_allow=%d dev= %s\n", sdev->srq_size,
2935-
sdev->device->attrs.max_srq_wr, device->name);
2936+
sdev->device->attrs.max_srq_wr, dev_name(&device->dev));
29362937

29372938
sdev->ioctx_ring = (struct srpt_recv_ioctx **)
29382939
srpt_alloc_ioctx_ring(sdev, sdev->srq_size,
@@ -2965,8 +2966,8 @@ static int srpt_use_srq(struct srpt_device *sdev, bool use_srq)
29652966
} else if (use_srq && !sdev->srq) {
29662967
ret = srpt_alloc_srq(sdev);
29672968
}
2968-
pr_debug("%s(%s): use_srq = %d; ret = %d\n", __func__, device->name,
2969-
sdev->use_srq, ret);
2969+
pr_debug("%s(%s): use_srq = %d; ret = %d\n", __func__,
2970+
dev_name(&device->dev), sdev->use_srq, ret);
29702971
return ret;
29712972
}
29722973

@@ -3052,7 +3053,7 @@ static void srpt_add_one(struct ib_device *device)
30523053

30533054
if (srpt_refresh_port(sport)) {
30543055
pr_err("MAD registration failed for %s-%d.\n",
3055-
sdev->device->name, i);
3056+
dev_name(&sdev->device->dev), i);
30563057
goto err_event;
30573058
}
30583059
}
@@ -3063,7 +3064,7 @@ static void srpt_add_one(struct ib_device *device)
30633064

30643065
out:
30653066
ib_set_client_data(device, &srpt_client, sdev);
3066-
pr_debug("added %s.\n", device->name);
3067+
pr_debug("added %s.\n", dev_name(&device->dev));
30673068
return;
30683069

30693070
err_event:
@@ -3078,7 +3079,7 @@ static void srpt_add_one(struct ib_device *device)
30783079
kfree(sdev);
30793080
err:
30803081
sdev = NULL;
3081-
pr_info("%s(%s) failed.\n", __func__, device->name);
3082+
pr_info("%s(%s) failed.\n", __func__, dev_name(&device->dev));
30823083
goto out;
30833084
}
30843085

@@ -3093,7 +3094,8 @@ static void srpt_remove_one(struct ib_device *device, void *client_data)
30933094
int i;
30943095

30953096
if (!sdev) {
3096-
pr_info("%s(%s): nothing to do.\n", __func__, device->name);
3097+
pr_info("%s(%s): nothing to do.\n", __func__,
3098+
dev_name(&device->dev));
30973099
return;
30983100
}
30993101

‎include/rdma/rdma_vt.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ static inline void rvt_set_ibdev_name(struct rvt_dev_info *rdi,
447447
*/
448448
static inline const char *rvt_get_ibdev_name(const struct rvt_dev_info *rdi)
449449
{
450-
return rdi->ibdev.name;
450+
return dev_name(&rdi->ibdev.dev);
451451
}
452452

453453
static inline struct rvt_pd *ibpd_to_rvtpd(struct ib_pd *ibpd)

0 commit comments

Comments
 (0)