Skip to content

Commit 9de6986

Browse files
jgunthorpejgunthorpe
committed
RDMA/drivers: 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: Leon Romanovsky <leonro@mellanox.com>
1 parent 896de00 commit 9de6986

File tree

8 files changed

+36
-31
lines changed

8 files changed

+36
-31
lines changed

‎drivers/infiniband/hw/nes/nes_verbs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,7 @@ static struct ib_pd *nes_alloc_pd(struct ib_device *ibdev,
687687
}
688688

689689
nes_debug(NES_DBG_PD, "Allocating PD (%p) for ib device %s\n",
690-
nespd, nesvnic->nesibdev->ibdev.name);
690+
nespd, dev_name(&nesvnic->nesibdev->ibdev.dev));
691691

692692
nespd->pd_id = (pd_num << (PAGE_SHIFT-12)) + nesadapter->base_pd;
693693

‎drivers/infiniband/hw/ocrdma/ocrdma_stats.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -764,7 +764,8 @@ void ocrdma_add_port_stats(struct ocrdma_dev *dev)
764764
return;
765765

766766
/* Create post stats base dir */
767-
dev->dir = debugfs_create_dir(dev->ibdev.name, ocrdma_dbgfs_dir);
767+
dev->dir =
768+
debugfs_create_dir(dev_name(&dev->ibdev.dev), ocrdma_dbgfs_dir);
768769
if (!dev->dir)
769770
goto err;
770771

‎drivers/infiniband/hw/qedr/qedr.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
#include "qedr_hsi_rdma.h"
4444

4545
#define QEDR_NODE_DESC "QLogic 579xx RoCE HCA"
46-
#define DP_NAME(dev) ((dev)->ibdev.name)
46+
#define DP_NAME(_dev) dev_name(&(_dev)->ibdev.dev)
4747
#define IS_IWARP(_dev) ((_dev)->rdma_type == QED_RDMA_TYPE_IWARP)
4848
#define IS_ROCE(_dev) ((_dev)->rdma_type == QED_RDMA_TYPE_ROCE)
4949

‎drivers/infiniband/hw/usnic/usnic_ib_main.c

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ static LIST_HEAD(usnic_ib_ibdev_list);
7676
static int usnic_ib_dump_vf_hdr(void *obj, char *buf, int buf_sz)
7777
{
7878
struct usnic_ib_vf *vf = obj;
79-
return scnprintf(buf, buf_sz, "PF: %s ", vf->pf->ib_dev.name);
79+
return scnprintf(buf, buf_sz, "PF: %s ", dev_name(&vf->pf->ib_dev.dev));
8080
}
8181
/* End callback dump funcs */
8282

@@ -138,7 +138,7 @@ static void usnic_ib_handle_usdev_event(struct usnic_ib_dev *us_ibdev,
138138
netdev = us_ibdev->netdev;
139139
switch (event) {
140140
case NETDEV_REBOOT:
141-
usnic_info("PF Reset on %s\n", us_ibdev->ib_dev.name);
141+
usnic_info("PF Reset on %s\n", dev_name(&us_ibdev->ib_dev.dev));
142142
usnic_ib_qp_grp_modify_active_to_err(us_ibdev);
143143
ib_event.event = IB_EVENT_PORT_ERR;
144144
ib_event.device = &us_ibdev->ib_dev;
@@ -151,15 +151,17 @@ static void usnic_ib_handle_usdev_event(struct usnic_ib_dev *us_ibdev,
151151
if (!us_ibdev->ufdev->link_up &&
152152
netif_carrier_ok(netdev)) {
153153
usnic_fwd_carrier_up(us_ibdev->ufdev);
154-
usnic_info("Link UP on %s\n", us_ibdev->ib_dev.name);
154+
usnic_info("Link UP on %s\n",
155+
dev_name(&us_ibdev->ib_dev.dev));
155156
ib_event.event = IB_EVENT_PORT_ACTIVE;
156157
ib_event.device = &us_ibdev->ib_dev;
157158
ib_event.element.port_num = 1;
158159
ib_dispatch_event(&ib_event);
159160
} else if (us_ibdev->ufdev->link_up &&
160161
!netif_carrier_ok(netdev)) {
161162
usnic_fwd_carrier_down(us_ibdev->ufdev);
162-
usnic_info("Link DOWN on %s\n", us_ibdev->ib_dev.name);
163+
usnic_info("Link DOWN on %s\n",
164+
dev_name(&us_ibdev->ib_dev.dev));
163165
usnic_ib_qp_grp_modify_active_to_err(us_ibdev);
164166
ib_event.event = IB_EVENT_PORT_ERR;
165167
ib_event.device = &us_ibdev->ib_dev;
@@ -168,17 +170,17 @@ static void usnic_ib_handle_usdev_event(struct usnic_ib_dev *us_ibdev,
168170
} else {
169171
usnic_dbg("Ignoring %s on %s\n",
170172
netdev_cmd_to_name(event),
171-
us_ibdev->ib_dev.name);
173+
dev_name(&us_ibdev->ib_dev.dev));
172174
}
173175
break;
174176
case NETDEV_CHANGEADDR:
175177
if (!memcmp(us_ibdev->ufdev->mac, netdev->dev_addr,
176178
sizeof(us_ibdev->ufdev->mac))) {
177179
usnic_dbg("Ignoring addr change on %s\n",
178-
us_ibdev->ib_dev.name);
180+
dev_name(&us_ibdev->ib_dev.dev));
179181
} else {
180182
usnic_info(" %s old mac: %pM new mac: %pM\n",
181-
us_ibdev->ib_dev.name,
183+
dev_name(&us_ibdev->ib_dev.dev),
182184
us_ibdev->ufdev->mac,
183185
netdev->dev_addr);
184186
usnic_fwd_set_mac(us_ibdev->ufdev, netdev->dev_addr);
@@ -193,19 +195,19 @@ static void usnic_ib_handle_usdev_event(struct usnic_ib_dev *us_ibdev,
193195
case NETDEV_CHANGEMTU:
194196
if (us_ibdev->ufdev->mtu != netdev->mtu) {
195197
usnic_info("MTU Change on %s old: %u new: %u\n",
196-
us_ibdev->ib_dev.name,
198+
dev_name(&us_ibdev->ib_dev.dev),
197199
us_ibdev->ufdev->mtu, netdev->mtu);
198200
usnic_fwd_set_mtu(us_ibdev->ufdev, netdev->mtu);
199201
usnic_ib_qp_grp_modify_active_to_err(us_ibdev);
200202
} else {
201203
usnic_dbg("Ignoring MTU change on %s\n",
202-
us_ibdev->ib_dev.name);
204+
dev_name(&us_ibdev->ib_dev.dev));
203205
}
204206
break;
205207
default:
206208
usnic_dbg("Ignoring event %s on %s",
207209
netdev_cmd_to_name(event),
208-
us_ibdev->ib_dev.name);
210+
dev_name(&us_ibdev->ib_dev.dev));
209211
}
210212
mutex_unlock(&us_ibdev->usdev_lock);
211213
}
@@ -267,7 +269,7 @@ static int usnic_ib_handle_inet_event(struct usnic_ib_dev *us_ibdev,
267269
default:
268270
usnic_info("Ignoring event %s on %s",
269271
netdev_cmd_to_name(event),
270-
us_ibdev->ib_dev.name);
272+
dev_name(&us_ibdev->ib_dev.dev));
271273
}
272274
mutex_unlock(&us_ibdev->usdev_lock);
273275

@@ -436,9 +438,9 @@ static void *usnic_ib_device_add(struct pci_dev *dev)
436438
kref_init(&us_ibdev->vf_cnt);
437439

438440
usnic_info("Added ibdev: %s netdev: %s with mac %pM Link: %u MTU: %u\n",
439-
us_ibdev->ib_dev.name, netdev_name(us_ibdev->netdev),
440-
us_ibdev->ufdev->mac, us_ibdev->ufdev->link_up,
441-
us_ibdev->ufdev->mtu);
441+
dev_name(&us_ibdev->ib_dev.dev),
442+
netdev_name(us_ibdev->netdev), us_ibdev->ufdev->mac,
443+
us_ibdev->ufdev->link_up, us_ibdev->ufdev->mtu);
442444
return us_ibdev;
443445

444446
err_fwd_dealloc:
@@ -451,7 +453,7 @@ static void *usnic_ib_device_add(struct pci_dev *dev)
451453

452454
static void usnic_ib_device_remove(struct usnic_ib_dev *us_ibdev)
453455
{
454-
usnic_info("Unregistering %s\n", us_ibdev->ib_dev.name);
456+
usnic_info("Unregistering %s\n", dev_name(&us_ibdev->ib_dev.dev));
455457
usnic_ib_sysfs_unregister_usdev(us_ibdev);
456458
usnic_fwd_dev_free(us_ibdev->ufdev);
457459
ib_unregister_device(&us_ibdev->ib_dev);
@@ -590,7 +592,7 @@ static int usnic_ib_pci_probe(struct pci_dev *pdev,
590592
mutex_unlock(&pf->usdev_lock);
591593

592594
usnic_info("Registering usnic VF %s into PF %s\n", pci_name(pdev),
593-
pf->ib_dev.name);
595+
dev_name(&pf->ib_dev.dev));
594596
usnic_ib_log_vf(vf);
595597
return 0;
596598

‎drivers/infiniband/hw/usnic/usnic_ib_sysfs.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ usnic_ib_show_config(struct device *device, struct device_attribute *attr,
9494

9595
n = scnprintf(ptr, left,
9696
"%s: %s:%d.%d, %s, %pM, %u VFs\n Per VF:",
97-
us_ibdev->ib_dev.name,
97+
dev_name(&us_ibdev->ib_dev.dev),
9898
busname,
9999
PCI_SLOT(us_ibdev->pdev->devfn),
100100
PCI_FUNC(us_ibdev->pdev->devfn),
@@ -119,7 +119,7 @@ usnic_ib_show_config(struct device *device, struct device_attribute *attr,
119119
UPDATE_PTR_LEFT(n, ptr, left);
120120
} else {
121121
n = scnprintf(ptr, left, "%s: no VFs\n",
122-
us_ibdev->ib_dev.name);
122+
dev_name(&us_ibdev->ib_dev.dev));
123123
UPDATE_PTR_LEFT(n, ptr, left);
124124
}
125125
mutex_unlock(&us_ibdev->usdev_lock);
@@ -285,7 +285,7 @@ int usnic_ib_sysfs_register_usdev(struct usnic_ib_dev *us_ibdev)
285285
usnic_class_attributes[i]);
286286
if (err) {
287287
usnic_err("Failed to create device file %d for %s eith err %d",
288-
i, us_ibdev->ib_dev.name, err);
288+
i, dev_name(&us_ibdev->ib_dev.dev), err);
289289
return -EINVAL;
290290
}
291291
}

‎drivers/infiniband/hw/usnic/usnic_ib_verbs.c

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,8 @@ static int usnic_ib_fill_create_qp_resp(struct usnic_ib_qp_grp *qp_grp,
159159

160160
err = ib_copy_to_udata(udata, &resp, sizeof(resp));
161161
if (err) {
162-
usnic_err("Failed to copy udata for %s", us_ibdev->ib_dev.name);
162+
usnic_err("Failed to copy udata for %s",
163+
dev_name(&us_ibdev->ib_dev.dev));
163164
return err;
164165
}
165166

@@ -197,7 +198,7 @@ find_free_vf_and_create_qp_grp(struct usnic_ib_dev *us_ibdev,
197198
vnic = vf->vnic;
198199
if (!usnic_vnic_check_room(vnic, res_spec)) {
199200
usnic_dbg("Found used vnic %s from %s\n",
200-
us_ibdev->ib_dev.name,
201+
dev_name(&us_ibdev->ib_dev.dev),
201202
pci_name(usnic_vnic_get_pdev(
202203
vnic)));
203204
qp_grp = usnic_ib_qp_grp_create(us_ibdev->ufdev,
@@ -230,7 +231,8 @@ find_free_vf_and_create_qp_grp(struct usnic_ib_dev *us_ibdev,
230231
spin_unlock(&vf->lock);
231232
}
232233

233-
usnic_info("No free qp grp found on %s\n", us_ibdev->ib_dev.name);
234+
usnic_info("No free qp grp found on %s\n",
235+
dev_name(&us_ibdev->ib_dev.dev));
234236
return ERR_PTR(-ENOMEM);
235237

236238
qp_grp_check:
@@ -471,7 +473,7 @@ struct ib_pd *usnic_ib_alloc_pd(struct ib_device *ibdev,
471473
}
472474

473475
usnic_info("domain 0x%p allocated for context 0x%p and device %s\n",
474-
pd, context, ibdev->name);
476+
pd, context, dev_name(&ibdev->dev));
475477
return &pd->ibpd;
476478
}
477479

@@ -508,20 +510,20 @@ struct ib_qp *usnic_ib_create_qp(struct ib_pd *pd,
508510
err = ib_copy_from_udata(&cmd, udata, sizeof(cmd));
509511
if (err) {
510512
usnic_err("%s: cannot copy udata for create_qp\n",
511-
us_ibdev->ib_dev.name);
513+
dev_name(&us_ibdev->ib_dev.dev));
512514
return ERR_PTR(-EINVAL);
513515
}
514516

515517
err = create_qp_validate_user_data(cmd);
516518
if (err) {
517519
usnic_err("%s: Failed to validate user data\n",
518-
us_ibdev->ib_dev.name);
520+
dev_name(&us_ibdev->ib_dev.dev));
519521
return ERR_PTR(-EINVAL);
520522
}
521523

522524
if (init_attr->qp_type != IB_QPT_UD) {
523525
usnic_err("%s asked to make a non-UD QP: %d\n",
524-
us_ibdev->ib_dev.name, init_attr->qp_type);
526+
dev_name(&us_ibdev->ib_dev.dev), init_attr->qp_type);
525527
return ERR_PTR(-EINVAL);
526528
}
527529

‎drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,7 @@ static void pvrdma_netdevice_event_handle(struct pvrdma_dev *dev,
734734

735735
default:
736736
dev_dbg(&dev->pdev->dev, "ignore netdevice event %ld on %s\n",
737-
event, dev->ib_dev.name);
737+
event, dev_name(&dev->ib_dev.dev));
738738
break;
739739
}
740740
}

‎drivers/infiniband/sw/rxe/rxe_net.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ struct rxe_dev *get_rxe_by_name(const char *name)
7272

7373
spin_lock_bh(&dev_list_lock);
7474
list_for_each_entry(rxe, &rxe_dev_list, list) {
75-
if (!strcmp(name, rxe->ib_dev.name)) {
75+
if (!strcmp(name, dev_name(&rxe->ib_dev.dev))) {
7676
found = rxe;
7777
break;
7878
}

0 commit comments

Comments
 (0)