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

Commit 1e35a088 authored by Bart Van Assche's avatar Bart Van Assche Committed by Doug Ledford
Browse files

IB/core: Use dev.parent instead of dma_device 



Prepare for removal of ib_device.dma_device.

Signed-off-by: default avatarBart Van Assche <bart.vanassche@sandisk.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent 97a9ea84

drivers/infiniband/core/ucm.c

+1 −1
Original line number Diff line number Diff line
@@ -1290,7 +1290,7 @@ static void ib_ucm_add_one(struct ib_device *device) 
		goto err;



	ucm_dev->dev.class = &cm_class;

	ucm_dev->dev.parent = device->dma_device;

	ucm_dev->dev.parent = device->dev.parent;

	ucm_dev->dev.devt = ucm_dev->cdev.dev;

	ucm_dev->dev.release = ib_ucm_release_dev;

	dev_set_name(&ucm_dev->dev, "ucm%d", ucm_dev->devnum);

drivers/infiniband/core/user_mad.c

+2 −2
Original line number Diff line number Diff line
@@ -1188,7 +1188,7 @@ static int ib_umad_init_port(struct ib_device *device, int port_num, 
	if (cdev_add(&port->cdev, base, 1))

		goto err_cdev;



	port->dev = device_create(umad_class, device->dma_device,

	port->dev = device_create(umad_class, device->dev.parent,

				  port->cdev.dev, port,

				  "umad%d", port->dev_num);

	if (IS_ERR(port->dev))
@@ -1207,7 +1207,7 @@ static int ib_umad_init_port(struct ib_device *device, int port_num, 
	if (cdev_add(&port->sm_cdev, base, 1))

		goto err_sm_cdev;



	port->sm_dev = device_create(umad_class, device->dma_device,

	port->sm_dev = device_create(umad_class, device->dev.parent,

				     port->sm_cdev.dev, port,

				     "issm%d", port->dev_num);

	if (IS_ERR(port->sm_dev))

drivers/infiniband/core/uverbs_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1174,7 +1174,7 @@ static void ib_uverbs_add_one(struct ib_device *device) 
	if (cdev_add(&uverbs_dev->cdev, base, 1))

		goto err_cdev;



	uverbs_dev->dev = device_create(uverbs_class, device->dma_device,

	uverbs_dev->dev = device_create(uverbs_class, device->dev.parent,

					uverbs_dev->cdev.dev, uverbs_dev,

					"uverbs%d", uverbs_dev->devnum);

	if (IS_ERR(uverbs_dev->dev))