1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/media/video/zc0301/zc0301_core.c b/drivers/media/video/zc0301/zc0301_core.c
index 0c3287734c93..6a0902bcba6b 100644
--- a/drivers/media/video/zc0301/zc0301_core.c
+++ b/drivers/media/video/zc0301/zc0301_core.c
@@ -657,7 +657,7 @@ static int zc0301_open(struct inode* inode, struct file* filp)
         if (!down_read_trylock(&zc0301_dev_lock))
                 return -EAGAIN;
 
-        cam = video_get_drvdata(video_devdata(filp));
+        cam = video_drvdata(filp);
 
         if (wait_for_completion_interruptible(&cam->probe)) {
                 up_read(&zc0301_dev_lock);
@@ -739,7 +739,7 @@ static int zc0301_release(struct inode* inode, struct file* filp)
 
         down_write(&zc0301_dev_lock);
 
-        cam = video_get_drvdata(video_devdata(filp));
+        cam = video_drvdata(filp);
 
         zc0301_stop_transfer(cam);
         zc0301_release_buffers(cam);
@@ -759,7 +759,7 @@ static int zc0301_release(struct inode* inode, struct file* filp)
 static ssize_t
 zc0301_read(struct file* filp, char __user * buf, size_t count, loff_t* f_pos)
 {
-        struct zc0301_device* cam = video_get_drvdata(video_devdata(filp));
+        struct zc0301_device *cam = video_drvdata(filp);
         struct zc0301_frame_t* f, * i;
         unsigned long lock_flags;
         long timeout;
@@ -866,7 +866,7 @@ exit:
 
 static unsigned int zc0301_poll(struct file *filp, poll_table *wait)
 {
-        struct zc0301_device* cam = video_get_drvdata(video_devdata(filp));
+        struct zc0301_device *cam = video_drvdata(filp);
         struct zc0301_frame_t* f;
         unsigned long lock_flags;
         unsigned int mask = 0;
@@ -941,7 +941,7 @@ static struct vm_operations_struct zc0301_vm_ops = {
 
 static int zc0301_mmap(struct file* filp, struct vm_area_struct *vma)
 {
-        struct zc0301_device* cam = video_get_drvdata(video_devdata(filp));
+        struct zc0301_device *cam = video_drvdata(filp);
         unsigned long size = vma->vm_end - vma->vm_start,
                       start = vma->vm_start;
         void *pos;
@@ -1796,7 +1796,7 @@ zc0301_vidioc_s_parm(struct zc0301_device* cam, void __user * arg)
 static int zc0301_ioctl_v4l2(struct inode* inode, struct file* filp,
                              unsigned int cmd, void __user * arg)
 {
-        struct zc0301_device* cam = video_get_drvdata(video_devdata(filp));
+        struct zc0301_device *cam = video_drvdata(filp);
 
         switch (cmd) {
 
@@ -1891,7 +1891,7 @@ static int zc0301_ioctl_v4l2(struct inode* inode, struct file* filp,
 static int zc0301_ioctl(struct inode* inode, struct file* filp,
                         unsigned int cmd, unsigned long arg)
 {
-        struct zc0301_device* cam = video_get_drvdata(video_devdata(filp));
+        struct zc0301_device *cam = video_drvdata(filp);
         int err = 0;
 
         if (mutex_lock_interruptible(&cam->fileop_mutex))