1 files changed, 21 insertions, 36 deletions

diff --git a/drivers/media/platform/sh_vou.c b/drivers/media/platform/sh_vou.c
index ab5bca40a5b3..e969fea3c122 100644
--- a/drivers/media/platform/sh_vou.c
+++ b/drivers/media/platform/sh_vou.c
@@ -420,8 +420,7 @@ static int sh_vou_enum_fmt_vid_out(struct file *file, void  *priv,
 static int sh_vou_g_fmt_vid_out(struct file *file, void *priv,
                                 struct v4l2_format *fmt)
 {
-        struct video_device *vdev = video_devdata(file);
-        struct sh_vou_device *vou_dev = video_get_drvdata(vdev);
+        struct sh_vou_device *vou_dev = video_drvdata(file);
 
         dev_dbg(vou_dev->v4l2_dev.dev, "%s()\n", __func__);
 
@@ -672,8 +671,7 @@ static void vou_adjust_output(struct sh_vou_geometry *geo, v4l2_std_id std)
 static int sh_vou_s_fmt_vid_out(struct file *file, void *priv,
                                 struct v4l2_format *fmt)
 {
-        struct video_device *vdev = video_devdata(file);
-        struct sh_vou_device *vou_dev = video_get_drvdata(vdev);
+        struct sh_vou_device *vou_dev = video_drvdata(file);
         struct v4l2_pix_format *pix = &fmt->fmt.pix;
         unsigned int img_height_max;
         int pix_idx;
@@ -830,8 +828,7 @@ static int sh_vou_dqbuf(struct file *file, void *priv, struct v4l2_buffer *b)
 static int sh_vou_streamon(struct file *file, void *priv,
                            enum v4l2_buf_type buftype)
 {
-        struct video_device *vdev = video_devdata(file);
-        struct sh_vou_device *vou_dev = video_get_drvdata(vdev);
+        struct sh_vou_device *vou_dev = video_drvdata(file);
         struct sh_vou_file *vou_file = priv;
         int ret;
 
@@ -849,8 +846,7 @@ static int sh_vou_streamon(struct file *file, void *priv,
 static int sh_vou_streamoff(struct file *file, void *priv,
                             enum v4l2_buf_type buftype)
 {
-        struct video_device *vdev = video_devdata(file);
-        struct sh_vou_device *vou_dev = video_get_drvdata(vdev);
+        struct sh_vou_device *vou_dev = video_drvdata(file);
         struct sh_vou_file *vou_file = priv;
 
         dev_dbg(vou_file->vbq.dev, "%s()\n", __func__);
@@ -882,13 +878,12 @@ static u32 sh_vou_ntsc_mode(enum sh_vou_bus_fmt bus_fmt)
 
 static int sh_vou_s_std(struct file *file, void *priv, v4l2_std_id *std_id)
 {
-        struct video_device *vdev = video_devdata(file);
-        struct sh_vou_device *vou_dev = video_get_drvdata(vdev);
+        struct sh_vou_device *vou_dev = video_drvdata(file);
         int ret;
 
         dev_dbg(vou_dev->v4l2_dev.dev, "%s(): 0x%llx\n", __func__, *std_id);
 
-        if (*std_id & ~vdev->tvnorms)
+        if (*std_id & ~vou_dev->vdev->tvnorms)
                 return -EINVAL;
 
         ret = v4l2_device_call_until_err(&vou_dev->v4l2_dev, 0, video,
@@ -910,8 +905,7 @@ static int sh_vou_s_std(struct file *file, void *priv, v4l2_std_id *std_id)
 
 static int sh_vou_g_std(struct file *file, void *priv, v4l2_std_id *std)
 {
-        struct video_device *vdev = video_devdata(file);
-        struct sh_vou_device *vou_dev = video_get_drvdata(vdev);
+        struct sh_vou_device *vou_dev = video_drvdata(file);
 
         dev_dbg(vou_dev->v4l2_dev.dev, "%s()\n", __func__);
 
@@ -922,8 +916,7 @@ static int sh_vou_g_std(struct file *file, void *priv, v4l2_std_id *std)
 
 static int sh_vou_g_crop(struct file *file, void *fh, struct v4l2_crop *a)
 {
-        struct video_device *vdev = video_devdata(file);
-        struct sh_vou_device *vou_dev = video_get_drvdata(vdev);
+        struct sh_vou_device *vou_dev = video_drvdata(file);
 
         dev_dbg(vou_dev->v4l2_dev.dev, "%s()\n", __func__);
 
@@ -937,8 +930,7 @@ static int sh_vou_g_crop(struct file *file, void *fh, struct v4l2_crop *a)
 static int sh_vou_s_crop(struct file *file, void *fh, const struct v4l2_crop *a)
 {
         struct v4l2_crop a_writable = *a;
-        struct video_device *vdev = video_devdata(file);
-        struct sh_vou_device *vou_dev = video_get_drvdata(vdev);
+        struct sh_vou_device *vou_dev = video_drvdata(file);
         struct v4l2_rect *rect = &a_writable.c;
         struct v4l2_crop sd_crop = {.type = V4L2_BUF_TYPE_VIDEO_OUTPUT};
         struct v4l2_pix_format *pix = &vou_dev->pix;
@@ -1161,8 +1153,7 @@ static int sh_vou_hw_init(struct sh_vou_device *vou_dev)
 /* File operations */
 static int sh_vou_open(struct file *file)
 {
-        struct video_device *vdev = video_devdata(file);
-        struct sh_vou_device *vou_dev = video_get_drvdata(vdev);
+        struct sh_vou_device *vou_dev = video_drvdata(file);
         struct sh_vou_file *vou_file = kzalloc(sizeof(struct sh_vou_file),
                                                GFP_KERNEL);
 
@@ -1179,11 +1170,11 @@ static int sh_vou_open(struct file *file)
                 int ret;
                 /* First open */
                 vou_dev->status = SH_VOU_INITIALISING;
-                pm_runtime_get_sync(vdev->v4l2_dev->dev);
+                pm_runtime_get_sync(vou_dev->v4l2_dev.dev);
                 ret = sh_vou_hw_init(vou_dev);
                 if (ret < 0) {
                         atomic_dec(&vou_dev->use_count);
-                        pm_runtime_put(vdev->v4l2_dev->dev);
+                        pm_runtime_put(vou_dev->v4l2_dev.dev);
                         vou_dev->status = SH_VOU_IDLE;
                         mutex_unlock(&vou_dev->fop_lock);
                         return ret;
@@ -1194,8 +1185,8 @@ static int sh_vou_open(struct file *file)
                                        vou_dev->v4l2_dev.dev, &vou_dev->lock,
                                        V4L2_BUF_TYPE_VIDEO_OUTPUT,
                                        V4L2_FIELD_NONE,
-                                       sizeof(struct videobuf_buffer), vdev,
-                                       &vou_dev->fop_lock);
+                                       sizeof(struct videobuf_buffer),
+                                       vou_dev->vdev, &vou_dev->fop_lock);
         mutex_unlock(&vou_dev->fop_lock);
 
         return 0;
@@ -1203,8 +1194,7 @@ static int sh_vou_open(struct file *file)
 
 static int sh_vou_release(struct file *file)
 {
-        struct video_device *vdev = video_devdata(file);
-        struct sh_vou_device *vou_dev = video_get_drvdata(vdev);
+        struct sh_vou_device *vou_dev = video_drvdata(file);
         struct sh_vou_file *vou_file = file->private_data;
 
         dev_dbg(vou_file->vbq.dev, "%s()\n", __func__);
@@ -1214,7 +1204,7 @@ static int sh_vou_release(struct file *file)
                 /* Last close */
                 vou_dev->status = SH_VOU_IDLE;
                 sh_vou_reg_a_set(vou_dev, VOUER, 0, 0x101);
-                pm_runtime_put(vdev->v4l2_dev->dev);
+                pm_runtime_put(vou_dev->v4l2_dev.dev);
                 mutex_unlock(&vou_dev->fop_lock);
         }
 
@@ -1226,8 +1216,7 @@ static int sh_vou_release(struct file *file)
 
 static int sh_vou_mmap(struct file *file, struct vm_area_struct *vma)
 {
-        struct video_device *vdev = video_devdata(file);
-        struct sh_vou_device *vou_dev = video_get_drvdata(vdev);
+        struct sh_vou_device *vou_dev = video_drvdata(file);
         struct sh_vou_file *vou_file = file->private_data;
         int ret;
 
@@ -1242,8 +1231,7 @@ static int sh_vou_mmap(struct file *file, struct vm_area_struct *vma)