[media] media: Use a better owner for the media device

mdev->fops->owner is actually the owner of the very same module which
implements media_device_register(), so it can't be unloaded anyway. Instead,
use THIS_MODULE through a macro as does video_register_device().

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c
index d5a7a135f75d39d5bc2f6fb3366639dd6dc7ee34..51217f00a668601c07a3b8850bfadd89cf0848de 100644 (file)
--- a/drivers/media/media-device.c
+++ b/drivers/media/media-device.c
@@ -372,7 +372,8 @@ static void media_device_release(struct media_devnode *mdev)
  * - dev must point to the parent device
  * - model must be filled with the device model name
  */
-int __must_check media_device_register(struct media_device *mdev)
+int __must_check __media_device_register(struct media_device *mdev,
+                                        struct module *owner)
 {
        int ret;
 
@@ -388,7 +389,7 @@ int __must_check media_device_register(struct media_device *mdev)
        mdev->devnode.fops = &media_device_fops;
        mdev->devnode.parent = mdev->dev;
        mdev->devnode.release = media_device_release;
-       ret = media_devnode_register(&mdev->devnode);
+       ret = media_devnode_register(&mdev->devnode, owner);
        if (ret < 0)
                return ret;
 
@@ -400,7 +401,7 @@ int __must_check media_device_register(struct media_device *mdev)
 
        return 0;
 }
-EXPORT_SYMBOL_GPL(media_device_register);
+EXPORT_SYMBOL_GPL(__media_device_register);
 
 /**
  * media_device_unregister - unregister a media device

diff --git a/drivers/media/media-devnode.c b/drivers/media/media-devnode.c
index fb0f0469fad7c015f2d27d0811c0c1d0bfc26951..7acd19c881debe4de5e98e9658108489d4c98c10 100644 (file)
--- a/drivers/media/media-devnode.c
+++ b/drivers/media/media-devnode.c
@@ -232,7 +232,8 @@ static const struct file_operations media_devnode_fops = {
  * the media_devnode structure is *not* called, so the caller is responsible for
  * freeing any data.
  */
-int __must_check media_devnode_register(struct media_devnode *mdev)
+int __must_check media_devnode_register(struct media_devnode *mdev,
+                                       struct module *owner)
 {
        int minor;
        int ret;
@@ -253,7 +254,7 @@ int __must_check media_devnode_register(struct media_devnode *mdev)
 
        /* Part 2: Initialize and register the character device */
        cdev_init(&mdev->cdev, &media_devnode_fops);
-       mdev->cdev.owner = mdev->fops->owner;
+       mdev->cdev.owner = owner;
 
        ret = cdev_add(&mdev->cdev, MKDEV(MAJOR(media_dev_t), mdev->minor), 1);
        if (ret < 0) {

diff --git a/include/media/media-device.h b/include/media/media-device.h
index 12155a9596c49c89350f1cdadbe6f1f301e27d10..6e6db78f1ee2d18bca17959bc1f0503cf28f5d88 100644 (file)
--- a/include/media/media-device.h
+++ b/include/media/media-device.h
@@ -87,7 +87,9 @@ struct media_device {
 /* media_devnode to media_device */
 #define to_media_device(node) container_of(node, struct media_device, devnode)
 
-int __must_check media_device_register(struct media_device *mdev);
+int __must_check __media_device_register(struct media_device *mdev,
+                                        struct module *owner);
+#define media_device_register(mdev) __media_device_register(mdev, THIS_MODULE)
 void media_device_unregister(struct media_device *mdev);
 
 int __must_check media_device_register_entity(struct media_device *mdev,

diff --git a/include/media/media-devnode.h b/include/media/media-devnode.h
index 3446af279fca4eba138e4edcfaf5a411643aef07..0dc7060f9625e337ccab3f88399f29496ea60876 100644 (file)
--- a/include/media/media-devnode.h
+++ b/include/media/media-devnode.h
@@ -82,7 +82,8 @@ struct media_devnode {
 /* dev to media_devnode */
 #define to_media_devnode(cd) container_of(cd, struct media_devnode, dev)
 
-int __must_check media_devnode_register(struct media_devnode *mdev);
+int __must_check media_devnode_register(struct media_devnode *mdev,
+                                       struct module *owner);
 void media_devnode_unregister(struct media_devnode *mdev);
 
 static inline struct media_devnode *media_devnode_data(struct file *filp)