Set sub-device owner field
Subsystems (2)
Sakari Ailus
maintainercover Set sub-device owner field
Hi folks,
This set makes v4l2_device_register_subdev() and v4l2_async_register_subdev() macros and prefixes the similarly named functions with "__". The macro is used to obtain THIS_MODULE pointer that is then passed to the function, in order to set the owner field of the sub-device.
Drivers often miss this and one could ask why should the drivers do this on their own. So instead do it consistently for all callers.
Sakari Ailus (2):
media: v4l: Set sub-device's owner field to the caller's module
media: v4l: async: Set owner for async sub-devices
drivers/media/v4l2-core/v4l2-async.c | 10 +++++++--- drivers/media/v4l2-core/v4l2-device.c | 12 +++++++----- drivers/media/v4l2-core/v4l2-i2c.c | 2 +- drivers/media/v4l2-core/v4l2-spi.c | 2 +- include/media/v4l2-async.h | 4 +++- include/media/v4l2-device.h | 7 +++++-- 6 files changed, 24 insertions(+), 13 deletions(-)
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH 1/2 media: v4l: Set sub-device's owner field to the caller's module
Set a sub-device's owner field to the caller's module, provided as an argument to the function. v4l2_device_register_subdev() becomes a macro passing THIS_MODULE to the __v4l2_device_register_subdev() function.
--- drivers/media/v4l2-core/v4l2-async.c | 2 +- drivers/media/v4l2-core/v4l2-device.c | 12 +++++++----- drivers/media/v4l2-core/v4l2-i2c.c | 2 +- drivers/media/v4l2-core/v4l2-spi.c | 2 +- include/media/v4l2-device.h | 7 +++++-- 5 files changed, 15 insertions(+), 10 deletions(-)
drivers/media/v4l2-core/v4l2-async.c +1 -1
@@ -341,7 +341,7 @@ static int v4l2_async_match_notify(struct v4l2_async_notifier *notifier,int ret;if (list_empty (&sd->asc_list)) { - ret =v4l2_device_register_subdev (v4l2_dev, sd); + ret =__v4l2_device_register_subdev (v4l2_dev, sd, sd->owner);if (ret <0 )return ret; registered = true;
drivers/media/v4l2-core/v4l2-device.c +7 -5
@@ -108,8 +108,8 @@ void v4l2_device_unregister(struct v4l2_device *v4l2_dev) }EXPORT_SYMBOL_GPL (v4l2_device_unregister); -int v4l2_device_register_subdev (struct v4l2_device *v4l2_dev, -struct v4l2_subdev *sd) +int __v4l2_device_register_subdev (struct v4l2_device *v4l2_dev, +struct v4l2_subdev *sd,struct module *module) {int err;
@@ -125,9 +125,9 @@ int v4l2_device_register_subdev(struct v4l2_device *v4l2_dev,* try_module_get() such sub-device owners. */ sd->owner_v4l2_dev = v4l2_dev->dev && v4l2_dev->dev->driver && - sd->owner == v4l2_dev->dev->driver->owner; + module == v4l2_dev->dev->driver->owner; -if (!sd->owner_v4l2_dev && !try_module_get (sd->owner)) +if (!sd->owner_v4l2_dev && !try_module_get (module))return -ENODEV ; sd->v4l2_dev = v4l2_dev;
@@ -152,6 +152,8 @@ int v4l2_device_register_subdev(struct v4l2_device *v4l2_dev, goto error_unregister; } + sd->owner = module; +spin_lock (&v4l2_dev->lock);list_add_tail (&sd->list, &v4l2_dev->subdevs);spin_unlock (&v4l2_dev->lock);
@@ -168,7 +170,7 @@ int v4l2_device_register_subdev(struct v4l2_device *v4l2_dev, sd->v4l2_dev =NULL ;return err; } -EXPORT_SYMBOL_GPL (v4l2_device_register_subdev); +EXPORT_SYMBOL_GPL (__v4l2_device_register_subdev);static void v4l2_subdev_release (struct v4l2_subdev *sd) {
drivers/media/v4l2-core/v4l2-i2c.c +1 -1
@@ -100,7 +100,7 @@ struct v4l2_subdev* Register with the v4l2_device which increases the module's * use count as well. */ -if (v4l2_device_register_subdev (v4l2_dev, sd)) +if (__v4l2_device_register_subdev (v4l2_dev, sd, sd->owner)) sd =NULL ;/* Decrease the module use count to match the first try_module_get. */ module_put (client->dev.driver->owner);
drivers/media/v4l2-core/v4l2-spi.c +1 -1
@@ -59,7 +59,7 @@ struct v4l2_subdev *v4l2_spi_new_subdev(struct v4l2_device *v4l2_dev,* Register with the v4l2_device which increases the module's * use count as well. */ -if (v4l2_device_register_subdev (v4l2_dev, sd)) +if (__v4l2_device_register_subdev (v4l2_dev, sd, sd->owner)) sd =NULL ;/* Decrease the module use count to match the first try_module_get. */
include/media/v4l2-device.h +5 -2
@@ -156,8 +156,11 @@ void v4l2_device_unregister(struct v4l2_device *v4l2_dev);* An error is returned if the module is no longer loaded on any attempts * to register it. */ -int __must_check v4l2_device_register_subdev (struct v4l2_device *v4l2_dev, -struct v4l2_subdev *sd); +#define v4l2_device_register_subdev (v4l2_dev, sd) \ + __v4l2_device_register_subdev(v4l2_dev, sd, THIS_MODULE) +int __must_check __v4l2_device_register_subdev (struct v4l2_device *v4l2_dev, +struct v4l2_subdev *sd, +struct module *module);/** * v4l2_device_unregister_subdev - Unregisters a subdev with a v4l2 device.
Signature · 1 line
2.39.2
Sakari Ailus
maintainerPATCH 2/2 media: v4l: async: Set owner for async sub-devices
Set the owner field of the async sub-devices by making v4l2_async_register_subdev() a macro and obtaining THIS_MODULE that way.
--- drivers/media/v4l2-core/v4l2-async.c | 8 ++++++-- include/media/v4l2-async.h | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-)
drivers/media/v4l2-core/v4l2-async.c +6 -2
@@ -785,7 +785,7 @@ v4l2_async_connection_unique(struct v4l2_subdev *sd) }EXPORT_SYMBOL_GPL (v4l2_async_connection_unique); -int v4l2_async_register_subdev (struct v4l2_subdev *sd) +int __v4l2_async_register_subdev (struct v4l2_subdev *sd,struct module *module) {struct v4l2_async_notifier *subdev_notifier;struct v4l2_async_notifier *notifier;
@@ -809,6 +809,8 @@ int v4l2_async_register_subdev(struct v4l2_subdev *sd)return -EINVAL ; } + sd->owner = module; +mutex_lock (&list_lock);list_for_each_entry (notifier, ¬ifier_list, notifier_entry) {
@@ -851,9 +853,11 @@ int v4l2_async_register_subdev(struct v4l2_subdev *sd)mutex_unlock (&list_lock); + sd->owner =NULL ; +return ret; } -EXPORT_SYMBOL (v4l2_async_register_subdev); +EXPORT_SYMBOL (__v4l2_async_register_subdev);void v4l2_async_unregister_subdev (struct v4l2_subdev *sd) {
include/media/v4l2-async.h +3 -1
@@ -310,7 +310,9 @@ void v4l2_async_nf_cleanup(struct v4l2_async_notifier *notifier);* * @sd: pointer to &struct v4l2_subdev */ -int v4l2_async_register_subdev (struct v4l2_subdev *sd); +#define v4l2_async_register_subdev (sd) \ + __v4l2_async_register_subdev(sd, THIS_MODULE) +int __v4l2_async_register_subdev (struct v4l2_subdev *sd,struct module *module);/** * v4l2_async_register_subdev_sensor - registers a sensor sub-device to the
Signature · 1 line
2.39.2