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>

diff --git a/drivers/infiniband/hw/nes/nes_verbs.c b/drivers/infiniband/hw/nes/nes_verbs.c
index 2127cd2..94054bc 100644 (file)
--- a/drivers/infiniband/hw/nes/nes_verbs.c
+++ b/drivers/infiniband/hw/nes/nes_verbs.c
@@ -687,7 +687,7 @@ static struct ib_pd *nes_alloc_pd(struct ib_device *ibdev,
        }
 
        nes_debug(NES_DBG_PD, "Allocating PD (%p) for ib device %s\n",
-                       nespd, nesvnic->nesibdev->ibdev.name);
+                       nespd, dev_name(&nesvnic->nesibdev->ibdev.dev));
 
        nespd->pd_id = (pd_num << (PAGE_SHIFT-12)) + nesadapter->base_pd;
 

diff --git a/drivers/infiniband/hw/ocrdma/ocrdma_stats.c b/drivers/infiniband/hw/ocrdma/ocrdma_stats.c
index 24d20a4..290d776 100644 (file)
--- a/drivers/infiniband/hw/ocrdma/ocrdma_stats.c
+++ b/drivers/infiniband/hw/ocrdma/ocrdma_stats.c
@@ -764,7 +764,8 @@ void ocrdma_add_port_stats(struct ocrdma_dev *dev)
                return;
 
        /* Create post stats base dir */
-       dev->dir = debugfs_create_dir(dev->ibdev.name, ocrdma_dbgfs_dir);
+       dev->dir =
+               debugfs_create_dir(dev_name(&dev->ibdev.dev), ocrdma_dbgfs_dir);
        if (!dev->dir)
                goto err;
 

diff --git a/drivers/infiniband/hw/qedr/qedr.h b/drivers/infiniband/hw/qedr/qedr.h
index a2d708d..53bbe6b 100644 (file)
--- a/drivers/infiniband/hw/qedr/qedr.h
+++ b/drivers/infiniband/hw/qedr/qedr.h
@@ -43,7 +43,7 @@
 #include "qedr_hsi_rdma.h"
 
 #define QEDR_NODE_DESC "QLogic 579xx RoCE HCA"
-#define DP_NAME(dev) ((dev)->ibdev.name)
+#define DP_NAME(_dev) dev_name(&(_dev)->ibdev.dev)
 #define IS_IWARP(_dev) ((_dev)->rdma_type == QED_RDMA_TYPE_IWARP)
 #define IS_ROCE(_dev) ((_dev)->rdma_type == QED_RDMA_TYPE_ROCE)
 

diff --git a/drivers/infiniband/hw/usnic/usnic_ib_main.c b/drivers/infiniband/hw/usnic/usnic_ib_main.c
index 3b9f129..e3f98fe 100644 (file)
--- a/drivers/infiniband/hw/usnic/usnic_ib_main.c
+++ b/drivers/infiniband/hw/usnic/usnic_ib_main.c
@@ -76,7 +76,7 @@ static LIST_HEAD(usnic_ib_ibdev_list);
 static int usnic_ib_dump_vf_hdr(void *obj, char *buf, int buf_sz)
 {
        struct usnic_ib_vf *vf = obj;
-       return scnprintf(buf, buf_sz, "PF: %s ", vf->pf->ib_dev.name);
+       return scnprintf(buf, buf_sz, "PF: %s ", dev_name(&vf->pf->ib_dev.dev));
 }
 /* End callback dump funcs */
 
@@ -138,7 +138,7 @@ static void usnic_ib_handle_usdev_event(struct usnic_ib_dev *us_ibdev,
        netdev = us_ibdev->netdev;
        switch (event) {
        case NETDEV_REBOOT:
-               usnic_info("PF Reset on %s\n", us_ibdev->ib_dev.name);
+               usnic_info("PF Reset on %s\n", dev_name(&us_ibdev->ib_dev.dev));
                usnic_ib_qp_grp_modify_active_to_err(us_ibdev);
                ib_event.event = IB_EVENT_PORT_ERR;
                ib_event.device = &us_ibdev->ib_dev;
@@ -151,7 +151,8 @@ static void usnic_ib_handle_usdev_event(struct usnic_ib_dev *us_ibdev,
                if (!us_ibdev->ufdev->link_up &&
                                netif_carrier_ok(netdev)) {
                        usnic_fwd_carrier_up(us_ibdev->ufdev);
-                       usnic_info("Link UP on %s\n", us_ibdev->ib_dev.name);
+                       usnic_info("Link UP on %s\n",
+                                  dev_name(&us_ibdev->ib_dev.dev));
                        ib_event.event = IB_EVENT_PORT_ACTIVE;
                        ib_event.device = &us_ibdev->ib_dev;
                        ib_event.element.port_num = 1;
@@ -159,7 +160,8 @@ static void usnic_ib_handle_usdev_event(struct usnic_ib_dev *us_ibdev,
                } else if (us_ibdev->ufdev->link_up &&
                                !netif_carrier_ok(netdev)) {
                        usnic_fwd_carrier_down(us_ibdev->ufdev);
-                       usnic_info("Link DOWN on %s\n", us_ibdev->ib_dev.name);
+                       usnic_info("Link DOWN on %s\n",
+                                  dev_name(&us_ibdev->ib_dev.dev));
                        usnic_ib_qp_grp_modify_active_to_err(us_ibdev);
                        ib_event.event = IB_EVENT_PORT_ERR;
                        ib_event.device = &us_ibdev->ib_dev;
@@ -168,17 +170,17 @@ static void usnic_ib_handle_usdev_event(struct usnic_ib_dev *us_ibdev,
                } else {
                        usnic_dbg("Ignoring %s on %s\n",
                                        netdev_cmd_to_name(event),
-                                       us_ibdev->ib_dev.name);
+                                       dev_name(&us_ibdev->ib_dev.dev));
                }
                break;
        case NETDEV_CHANGEADDR:
                if (!memcmp(us_ibdev->ufdev->mac, netdev->dev_addr,
                                sizeof(us_ibdev->ufdev->mac))) {
                        usnic_dbg("Ignoring addr change on %s\n",
-                                       us_ibdev->ib_dev.name);
+                                 dev_name(&us_ibdev->ib_dev.dev));
                } else {
                        usnic_info(" %s old mac: %pM new mac: %pM\n",
-                                       us_ibdev->ib_dev.name,
+                                       dev_name(&us_ibdev->ib_dev.dev),
                                        us_ibdev->ufdev->mac,
                                        netdev->dev_addr);
                        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,
        case NETDEV_CHANGEMTU:
                if (us_ibdev->ufdev->mtu != netdev->mtu) {
                        usnic_info("MTU Change on %s old: %u new: %u\n",
-                                       us_ibdev->ib_dev.name,
+                                       dev_name(&us_ibdev->ib_dev.dev),
                                        us_ibdev->ufdev->mtu, netdev->mtu);
                        usnic_fwd_set_mtu(us_ibdev->ufdev, netdev->mtu);
                        usnic_ib_qp_grp_modify_active_to_err(us_ibdev);
                } else {
                        usnic_dbg("Ignoring MTU change on %s\n",
-                                       us_ibdev->ib_dev.name);
+                                 dev_name(&us_ibdev->ib_dev.dev));
                }
                break;
        default:
                usnic_dbg("Ignoring event %s on %s",
                                netdev_cmd_to_name(event),
-                               us_ibdev->ib_dev.name);
+                               dev_name(&us_ibdev->ib_dev.dev));
        }
        mutex_unlock(&us_ibdev->usdev_lock);
 }
@@ -267,7 +269,7 @@ static int usnic_ib_handle_inet_event(struct usnic_ib_dev *us_ibdev,
        default:
                usnic_info("Ignoring event %s on %s",
                                netdev_cmd_to_name(event),
-                               us_ibdev->ib_dev.name);
+                               dev_name(&us_ibdev->ib_dev.dev));
        }
        mutex_unlock(&us_ibdev->usdev_lock);
 
@@ -436,9 +438,9 @@ static void *usnic_ib_device_add(struct pci_dev *dev)
        kref_init(&us_ibdev->vf_cnt);
 
        usnic_info("Added ibdev: %s netdev: %s with mac %pM Link: %u MTU: %u\n",
-                       us_ibdev->ib_dev.name, netdev_name(us_ibdev->netdev),
-                       us_ibdev->ufdev->mac, us_ibdev->ufdev->link_up,
-                       us_ibdev->ufdev->mtu);
+                  dev_name(&us_ibdev->ib_dev.dev),
+                  netdev_name(us_ibdev->netdev), us_ibdev->ufdev->mac,
+                  us_ibdev->ufdev->link_up, us_ibdev->ufdev->mtu);
        return us_ibdev;
 
 err_fwd_dealloc:
@@ -451,7 +453,7 @@ err_dealloc:
 
 static void usnic_ib_device_remove(struct usnic_ib_dev *us_ibdev)
 {
-       usnic_info("Unregistering %s\n", us_ibdev->ib_dev.name);
+       usnic_info("Unregistering %s\n", dev_name(&us_ibdev->ib_dev.dev));
        usnic_ib_sysfs_unregister_usdev(us_ibdev);
        usnic_fwd_dev_free(us_ibdev->ufdev);
        ib_unregister_device(&us_ibdev->ib_dev);
@@ -590,7 +592,7 @@ static int usnic_ib_pci_probe(struct pci_dev *pdev,
        mutex_unlock(&pf->usdev_lock);
 
        usnic_info("Registering usnic VF %s into PF %s\n", pci_name(pdev),
-                       pf->ib_dev.name);
+                  dev_name(&pf->ib_dev.dev));
        usnic_ib_log_vf(vf);
        return 0;
 

diff --git a/drivers/infiniband/hw/usnic/usnic_ib_sysfs.c b/drivers/infiniband/hw/usnic/usnic_ib_sysfs.c
index 4210ca1..fab4cb7 100644 (file)
--- a/drivers/infiniband/hw/usnic/usnic_ib_sysfs.c
+++ b/drivers/infiniband/hw/usnic/usnic_ib_sysfs.c
@@ -94,7 +94,7 @@ usnic_ib_show_config(struct device *device, struct device_attribute *attr,
 
                n = scnprintf(ptr, left,
                        "%s: %s:%d.%d, %s, %pM, %u VFs\n Per VF:",
-                       us_ibdev->ib_dev.name,
+                       dev_name(&us_ibdev->ib_dev.dev),
                        busname,
                        PCI_SLOT(us_ibdev->pdev->devfn),
                        PCI_FUNC(us_ibdev->pdev->devfn),
@@ -119,7 +119,7 @@ usnic_ib_show_config(struct device *device, struct device_attribute *attr,
                UPDATE_PTR_LEFT(n, ptr, left);
        } else {
                n = scnprintf(ptr, left, "%s: no VFs\n",
-                               us_ibdev->ib_dev.name);
+                               dev_name(&us_ibdev->ib_dev.dev));
                UPDATE_PTR_LEFT(n, ptr, left);
        }
        mutex_unlock(&us_ibdev->usdev_lock);
@@ -285,7 +285,7 @@ int usnic_ib_sysfs_register_usdev(struct usnic_ib_dev *us_ibdev)
                                                usnic_class_attributes[i]);
                if (err) {
                        usnic_err("Failed to create device file %d for %s eith err %d",
-                               i, us_ibdev->ib_dev.name, err);
+                               i, dev_name(&us_ibdev->ib_dev.dev), err);
                        return -EINVAL;
                }
        }

diff --git a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
index 9973ac8..0b91ff3 100644 (file)
--- a/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
+++ b/drivers/infiniband/hw/usnic/usnic_ib_verbs.c
@@ -159,7 +159,8 @@ static int usnic_ib_fill_create_qp_resp(struct usnic_ib_qp_grp *qp_grp,
 
        err = ib_copy_to_udata(udata, &resp, sizeof(resp));
        if (err) {
-               usnic_err("Failed to copy udata for %s", us_ibdev->ib_dev.name);
+               usnic_err("Failed to copy udata for %s",
+                         dev_name(&us_ibdev->ib_dev.dev));
                return err;
        }
 
@@ -197,7 +198,7 @@ find_free_vf_and_create_qp_grp(struct usnic_ib_dev *us_ibdev,
                        vnic = vf->vnic;
                        if (!usnic_vnic_check_room(vnic, res_spec)) {
                                usnic_dbg("Found used vnic %s from %s\n",
-                                               us_ibdev->ib_dev.name,
+                                               dev_name(&us_ibdev->ib_dev.dev),
                                                pci_name(usnic_vnic_get_pdev(
                                                                        vnic)));
                                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,
                spin_unlock(&vf->lock);
        }
 
-       usnic_info("No free qp grp found on %s\n", us_ibdev->ib_dev.name);
+       usnic_info("No free qp grp found on %s\n",
+                  dev_name(&us_ibdev->ib_dev.dev));
        return ERR_PTR(-ENOMEM);
 
 qp_grp_check:
@@ -471,7 +473,7 @@ struct ib_pd *usnic_ib_alloc_pd(struct ib_device *ibdev,
        }
 
        usnic_info("domain 0x%p allocated for context 0x%p and device %s\n",
-                       pd, context, ibdev->name);
+                  pd, context, dev_name(&ibdev->dev));
        return &pd->ibpd;
 }
 
@@ -508,20 +510,20 @@ struct ib_qp *usnic_ib_create_qp(struct ib_pd *pd,
        err = ib_copy_from_udata(&cmd, udata, sizeof(cmd));
        if (err) {
                usnic_err("%s: cannot copy udata for create_qp\n",
-                               us_ibdev->ib_dev.name);
+                         dev_name(&us_ibdev->ib_dev.dev));
                return ERR_PTR(-EINVAL);
        }
 
        err = create_qp_validate_user_data(cmd);
        if (err) {
                usnic_err("%s: Failed to validate user data\n",
-                               us_ibdev->ib_dev.name);
+                         dev_name(&us_ibdev->ib_dev.dev));
                return ERR_PTR(-EINVAL);
        }
 
        if (init_attr->qp_type != IB_QPT_UD) {
                usnic_err("%s asked to make a non-UD QP: %d\n",
-                               us_ibdev->ib_dev.name, init_attr->qp_type);
+                         dev_name(&us_ibdev->ib_dev.dev), init_attr->qp_type);
                return ERR_PTR(-EINVAL);
        }
 

diff --git a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c
index 6878107..c1e3198 100644 (file)
--- a/drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c
+++ b/drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c
@@ -734,7 +734,7 @@ static void pvrdma_netdevice_event_handle(struct pvrdma_dev *dev,
 
        default:
                dev_dbg(&dev->pdev->dev, "ignore netdevice event %ld on %s\n",
-                       event, dev->ib_dev.name);
+                       event, dev_name(&dev->ib_dev.dev));
                break;
        }
 }

diff --git a/drivers/infiniband/sw/rxe/rxe_net.c b/drivers/infiniband/sw/rxe/rxe_net.c
index 8e658ce..fb06f94 100644 (file)
--- a/drivers/infiniband/sw/rxe/rxe_net.c
+++ b/drivers/infiniband/sw/rxe/rxe_net.c
@@ -72,7 +72,7 @@ struct rxe_dev *get_rxe_by_name(const char *name)
 
        spin_lock_bh(&dev_list_lock);
        list_for_each_entry(rxe, &rxe_dev_list, list) {
-               if (!strcmp(name, rxe->ib_dev.name)) {
+               if (!strcmp(name, dev_name(&rxe->ib_dev.dev))) {
                        found = rxe;
                        break;
                }