1 files changed, 9 insertions, 16 deletions

diff --git a/drivers/media/video/vino.c b/drivers/media/video/vino.c
index 1edda456fc64..8ec57df1904f 100644
--- a/drivers/media/video/vino.c
+++ b/drivers/media/video/vino.c
@@ -39,7 +39,6 @@
 #include <linux/i2c-algo-sgi.h>
 
 #include <linux/videodev2.h>
-#include <media/v4l2-ioctl.h>
 #include <media/v4l2-common.h>
 #include <media/v4l2-ioctl.h>
 #include <linux/video_decoder.h>
@@ -810,7 +809,7 @@ static void vino_free_buffer_with_count(struct vino_framebuffer *fb,
         dprintk("vino_free_buffer_with_count(): count = %d\n", count);
 
         for (i = 0; i < count; i++) {
-                ClearPageReserved(virt_to_page(fb->desc_table.virtual[i]));
+                ClearPageReserved(virt_to_page((void *)fb->desc_table.virtual[i]));
                 dma_unmap_single(NULL,
                                  fb->desc_table.dma_cpu[VINO_PAGE_RATIO * i],
                                  PAGE_SIZE, DMA_FROM_DEVICE);
@@ -888,7 +887,7 @@ static int vino_allocate_buffer(struct vino_framebuffer *fb,
                                 dma_data_addr + VINO_PAGE_SIZE * j;
                 }
 
-                SetPageReserved(virt_to_page(fb->desc_table.virtual[i]));
+                SetPageReserved(virt_to_page((void *)fb->desc_table.virtual[i]));
         }
 
         /* page_count needs to be set anyway, because the descriptor table has
@@ -975,7 +974,7 @@ static int vino_prepare_user_buffer(struct vino_framebuffer *fb,
                                 dma_data_addr + VINO_PAGE_SIZE * j;
                 }
 
-                SetPageReserved(virt_to_page(fb->desc_table.virtual[i]));
+                SetPageReserved(virt_to_page((void *)fb->desc_table.virtual[i]));
         }
 
         /* page_count needs to be set anyway, because the descriptor table has
@@ -4025,8 +4024,7 @@ out:
 
 static int vino_open(struct inode *inode, struct file *file)
 {
-        struct video_device *dev = video_devdata(file);
-        struct vino_channel_settings *vcs = video_get_drvdata(dev);
+        struct vino_channel_settings *vcs = video_drvdata(file);
         int ret = 0;
         dprintk("open(): channel = %c\n",
                (vcs->channel == VINO_CHANNEL_A) ? 'A' : 'B');
@@ -4057,8 +4055,7 @@ static int vino_open(struct inode *inode, struct file *file)
 
 static int vino_close(struct inode *inode, struct file *file)
 {
-        struct video_device *dev = video_devdata(file);
-        struct vino_channel_settings *vcs = video_get_drvdata(dev);
+        struct vino_channel_settings *vcs = video_drvdata(file);
         dprintk("close():\n");
 
         mutex_lock(&vcs->mutex);
@@ -4101,8 +4098,7 @@ static struct vm_operations_struct vino_vm_ops = {
 
 static int vino_mmap(struct file *file, struct vm_area_struct *vma)
 {
-        struct video_device *dev = video_devdata(file);
-        struct vino_channel_settings *vcs = video_get_drvdata(dev);
+        struct vino_channel_settings *vcs = video_drvdata(file);
 
         unsigned long start = vma->vm_start;
         unsigned long size = vma->vm_end - vma->vm_start;
@@ -4207,8 +4203,7 @@ out:
 
 static unsigned int vino_poll(struct file *file, poll_table *pt)
 {
-        struct video_device *dev = video_devdata(file);
-        struct vino_channel_settings *vcs = video_get_drvdata(dev);
+        struct vino_channel_settings *vcs = video_drvdata(file);
         unsigned int outgoing;
         unsigned int ret = 0;
 
@@ -4248,8 +4243,7 @@ error:
 static int vino_do_ioctl(struct inode *inode, struct file *file,
                       unsigned int cmd, void *arg)
 {
-        struct video_device *dev = video_devdata(file);
-        struct vino_channel_settings *vcs = video_get_drvdata(dev);
+        struct vino_channel_settings *vcs = video_drvdata(file);
 
 #ifdef VINO_DEBUG
         switch (_IOC_TYPE(cmd)) {
@@ -4356,8 +4350,7 @@ static int vino_do_ioctl(struct inode *inode, struct file *file,
 static int vino_ioctl(struct inode *inode, struct file *file,
                       unsigned int cmd, unsigned long arg)
 {
-        struct video_device *dev = video_devdata(file);
-        struct vino_channel_settings *vcs = video_get_drvdata(dev);
+        struct vino_channel_settings *vcs = video_drvdata(file);
         int ret;
 
         if (mutex_lock_interruptible(&vcs->mutex))