Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9de69861 authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

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: default avatarJason Gunthorpe <jgg@mellanox.com>
Reviewed-by: default avatarLeon Romanovsky <leonro@mellanox.com>
parent 896de009

drivers/infiniband/hw/nes/nes_verbs.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/infiniband/hw/ocrdma/ocrdma_stats.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

drivers/infiniband/hw/qedr/qedr.h

+1 −1
Original line number Diff line number Diff line
@@ -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)

drivers/infiniband/hw/usnic/usnic_ib_main.c

+18 −16
Original line number Diff line number Diff line
@@ -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 @@ static void *usnic_ib_device_add(struct pci_dev *dev) 


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;

drivers/infiniband/hw/usnic/usnic_ib_sysfs.c

+3 −3
Original line number Diff line number Diff line
@@ -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;

		}

	}