@@ -137,19 +137,26 @@ static int __must_check cec_devnode_register(struct cec_devnode *devnode,
/* Part 2: Initialize and register the character device */
cdev_init(&devnode->cdev, &cec_devnode_fops);
+ devnode->cdev.kobj.parent = &devnode->dev.kobj;
devnode->cdev.owner = owner;
kobject_set_name(&devnode->cdev.kobj, "cec%d", devnode->minor);
devnode->registered = true;
- ret = cdev_device_add(&devnode->cdev, &devnode->dev);
- if (ret) {
+ ret = cdev_add(&devnode->cdev, devnode->dev.devt, 1);
+ if (ret < 0) {
+ pr_err("%s: cdev_add failed\n", __func__);
devnode->registered = false;
- pr_err("%s: cdev_device_add failed\n", __func__);
goto clr_bit;
}
+ ret = device_add(&devnode->dev);
+ if (ret)
+ goto cdev_del;
+
return 0;
+cdev_del:
+ cdev_del(&devnode->cdev);
clr_bit:
mutex_lock(&cec_devnode_lock);
clear_bit(devnode->minor, cec_devnode_nums);
@@ -193,7 +200,8 @@ static void cec_devnode_unregister(struct cec_adapter *adap)
__cec_s_log_addrs(adap, NULL, false);
mutex_unlock(&adap->lock);
- cdev_device_del(&devnode->cdev, &devnode->dev);
+ device_del(&devnode->dev);
+ cdev_del(&devnode->cdev);
put_device(&devnode->dev);
}
@@ -240,23 +240,33 @@ int __must_check media_devnode_register(struct media_device *mdev,
dev_set_name(&devnode->dev, "media%d", devnode->minor);
device_initialize(&devnode->dev);
- /* Part 2: Initialize the character device */
+ /* Part 2: Initialize and register the character device */
cdev_init(&devnode->cdev, &media_devnode_fops);
devnode->cdev.owner = owner;
+ devnode->cdev.kobj.parent = &devnode->dev.kobj;
kobject_set_name(&devnode->cdev.kobj, "media%d", devnode->minor);
- /* Part 3: Add the media and char device */
- ret = cdev_device_add(&devnode->cdev, &devnode->dev);
+ ret = cdev_add(&devnode->cdev, MKDEV(MAJOR(media_dev_t),
+ devnode->minor), 1);
if (ret < 0) {
- pr_err("%s: cdev_device_add failed\n", __func__);
+ pr_err("%s: cdev_add failed\n", __func__);
goto cdev_add_error;
}
+ /* Part 3: Add the media device */
+ ret = device_add(&devnode->dev);
+ if (ret < 0) {
+ pr_err("%s: device_add failed\n", __func__);
+ goto device_add_error;
+ }
+
/* Part 4: Activate this minor. The char device can now be used. */
set_bit(MEDIA_FLAG_REGISTERED, &devnode->flags);
return 0;
+device_add_error:
+ cdev_del(&devnode->cdev);
cdev_add_error:
mutex_lock(&media_devnode_lock);
clear_bit(devnode->minor, media_devnode_nums);
@@ -276,9 +286,10 @@ void media_devnode_unregister(struct media_devnode *devnode)
mutex_lock(&media_devnode_lock);
clear_bit(MEDIA_FLAG_REGISTERED, &devnode->flags);
/* Delete the cdev on this minor as well */
- cdev_device_del(&devnode->cdev, &devnode->dev);
+ cdev_del(&devnode->cdev);
devnode->media_dev = NULL;
mutex_unlock(&media_devnode_lock);
+ device_del(&devnode->dev);
put_device(&devnode->dev);
}
This reverts commit 857313e51006ff51524579bcd8808b70f9a80812. This patch is temporarily reverted for internal rework. Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> --- drivers/media/cec/core/cec-core.c | 16 ++++++++++++---- drivers/media/mc/mc-devnode.c | 21 ++++++++++++++++----- 2 files changed, 28 insertions(+), 9 deletions(-)