Commit ab3d8e1b authored by Sudeep Holla's avatar Sudeep Holla Committed by Jens Wiklander
Browse files

tee: replace cdev_add + device_add with cdev_device_add 



Commit 233ed09d ("chardev: add helper function to register char devs
with a struct device") added a helper function 'cdev_device_add'.

Make use of cdev_device_add in tee_device_register to replace cdev_add
and device_add. Since cdev_device_add takes care of setting the
kobj->parent, drop explicit initialisation in tee_device_alloc.

Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Signed-off-by: default avatarJens Wiklander <jens.wiklander@linaro.org>
parent 9123e3a7

drivers/tee/tee_core.c

+4 −17
Original line number Diff line number Diff line
@@ -917,7 +917,6 @@ struct tee_device *tee_device_alloc(const struct tee_desc *teedesc, 


	cdev_init(&teedev->cdev, &tee_fops);

	teedev->cdev.owner = teedesc->owner;

	teedev->cdev.kobj.parent = &teedev->dev.kobj;



	dev_set_drvdata(&teedev->dev, driver_data);

	device_initialize(&teedev->dev);
@@ -985,24 +984,15 @@ int tee_device_register(struct tee_device *teedev) 
		return -EINVAL;

	}



	rc = cdev_add(&teedev->cdev, teedev->dev.devt, 1);

	rc = cdev_device_add(&teedev->cdev, &teedev->dev);

	if (rc) {

		dev_err(&teedev->dev,

			"unable to cdev_add() %s, major %d, minor %d, err=%d\n",

			"unable to cdev_device_add() %s, major %d, minor %d, err=%d\n",

			teedev->name, MAJOR(teedev->dev.devt),

			MINOR(teedev->dev.devt), rc);

		return rc;

	}



	rc = device_add(&teedev->dev);

	if (rc) {

		dev_err(&teedev->dev,

			"unable to device_add() %s, major %d, minor %d, err=%d\n",

			teedev->name, MAJOR(teedev->dev.devt),

			MINOR(teedev->dev.devt), rc);

		goto err_device_add;

	}



	rc = sysfs_create_group(&teedev->dev.kobj, &tee_dev_group);

	if (rc) {

		dev_err(&teedev->dev,
@@ -1014,9 +1004,7 @@ int tee_device_register(struct tee_device *teedev) 
	return 0;



err_sysfs_create_group:

	device_del(&teedev->dev);

err_device_add:

	cdev_del(&teedev->cdev);

	cdev_device_del(&teedev->cdev, &teedev->dev);

	return rc;

}

EXPORT_SYMBOL_GPL(tee_device_register);
@@ -1062,8 +1050,7 @@ void tee_device_unregister(struct tee_device *teedev) 


	if (teedev->flags & TEE_DEVICE_FLAG_REGISTERED) {

		sysfs_remove_group(&teedev->dev.kobj, &tee_dev_group);

		cdev_del(&teedev->cdev);

		device_del(&teedev->dev);

		cdev_device_del(&teedev->cdev, &teedev->dev);

	}



	tee_device_put(teedev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE