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

Commit 6c854111 authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

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: default avatarJason Gunthorpe <jgg@mellanox.com>
Reviewed-by: default avatarSteve Wise <swise@opengridcomputing.com>
Reviewed-by: default avatarSagi Grimberg <sagi@grimberg.me>
Reviewed-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
parent 9de69861

drivers/infiniband/ulp/ipoib/ipoib_verbs.c

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

drivers/infiniband/ulp/iser/iser_verbs.c

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

drivers/infiniband/ulp/isert/ib_isert.c

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

drivers/infiniband/ulp/opa_vnic/opa_vnic_vema.c

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

drivers/infiniband/ulp/srp/ib_srp.c

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