V4L/DVB (10644): v4l2-subdev: rename dev field to v4l2_dev

Remain consistent in the naming: fields pointing to v4l2_device should
be called v4l2_dev. There are too many device-like entities without
adding to the confusion by mixing naming conventions.

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/media/video/v4l2-device.c b/drivers/media/video/v4l2-device.c
index 3330ffb7d010..b3dcb8454379 100644
--- a/drivers/media/video/v4l2-device.c
+++ b/drivers/media/video/v4l2-device.c
@@ -72,10 +72,10 @@ int v4l2_device_register_subdev(struct v4l2_device *v4l2_dev,
         if (v4l2_dev == NULL || sd == NULL || !sd->name[0])
                 return -EINVAL;
         /* Warn if we apparently re-register a subdev */
-        WARN_ON(sd->dev != NULL);
+        WARN_ON(sd->v4l2_dev != NULL);
         if (!try_module_get(sd->owner))
                 return -ENODEV;
-        sd->dev = v4l2_dev;
+        sd->v4l2_dev = v4l2_dev;
         spin_lock(&v4l2_dev->lock);
         list_add_tail(&sd->list, &v4l2_dev->subdevs);
         spin_unlock(&v4l2_dev->lock);
@@ -86,12 +86,12 @@ EXPORT_SYMBOL_GPL(v4l2_device_register_subdev);
 void v4l2_device_unregister_subdev(struct v4l2_subdev *sd)
 {
         /* return if it isn't registered */
-        if (sd == NULL || sd->dev == NULL)
+        if (sd == NULL || sd->v4l2_dev == NULL)
                 return;
-        spin_lock(&sd->dev->lock);
+        spin_lock(&sd->v4l2_dev->lock);
         list_del(&sd->list);
-        spin_unlock(&sd->dev->lock);
-        sd->dev = NULL;
+        spin_unlock(&sd->v4l2_dev->lock);
+        sd->v4l2_dev = NULL;
         module_put(sd->owner);
 }
 EXPORT_SYMBOL_GPL(v4l2_device_unregister_subdev);