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

Commit 98508715 authored by Logan Gunthorpe's avatar Logan Gunthorpe Committed by Greg Kroah-Hartman
Browse files

infiniband: utilize the new cdev_set_parent function 



This replaces the suspect looking cdev.kobj.parent lines with the
equivalent cdev_set_parent function. This is a straightforward change
that's largely cosmetic but it does push the kobj.parent ownership
into char_dev.c where it belongs.

Signed-off-by: default avatarLogan Gunthorpe <logang@deltatee.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a0d78193

drivers/infiniband/core/user_mad.c

+2 −2
Original line number Diff line number Diff line
@@ -1183,7 +1183,7 @@ static int ib_umad_init_port(struct ib_device *device, int port_num, 


	cdev_init(&port->cdev, &umad_fops);

	port->cdev.owner = THIS_MODULE;

	port->cdev.kobj.parent = &umad_dev->kobj;

	cdev_set_parent(&port->cdev, &umad_dev->kobj);

	kobject_set_name(&port->cdev.kobj, "umad%d", port->dev_num);

	if (cdev_add(&port->cdev, base, 1))

		goto err_cdev;
@@ -1202,7 +1202,7 @@ static int ib_umad_init_port(struct ib_device *device, int port_num, 
	base += IB_UMAD_MAX_PORTS;

	cdev_init(&port->sm_cdev, &umad_sm_fops);

	port->sm_cdev.owner = THIS_MODULE;

	port->sm_cdev.kobj.parent = &umad_dev->kobj;

	cdev_set_parent(&port->sm_cdev, &umad_dev->kobj);

	kobject_set_name(&port->sm_cdev.kobj, "issm%d", port->dev_num);

	if (cdev_add(&port->sm_cdev, base, 1))

		goto err_sm_cdev;

drivers/infiniband/core/uverbs_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1189,7 +1189,7 @@ static void ib_uverbs_add_one(struct ib_device *device) 
	cdev_init(&uverbs_dev->cdev, NULL);

	uverbs_dev->cdev.owner = THIS_MODULE;

	uverbs_dev->cdev.ops = device->mmap ? &uverbs_mmap_fops : &uverbs_fops;

	uverbs_dev->cdev.kobj.parent = &uverbs_dev->kobj;

	cdev_set_parent(&uverbs_dev->cdev, &uverbs_dev->kobj);

	kobject_set_name(&uverbs_dev->cdev.kobj, "uverbs%d", uverbs_dev->devnum);

	if (cdev_add(&uverbs_dev->cdev, base, 1))

		goto err_cdev;

drivers/infiniband/hw/hfi1/device.c

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ int hfi1_cdev_init(int minor, const char *name, 


	cdev_init(cdev, fops);

	cdev->owner = THIS_MODULE;

	cdev->kobj.parent = parent;

	cdev_set_parent(cdev, parent);

	kobject_set_name(&cdev->kobj, name);



	ret = cdev_add(cdev, dev, 1);