aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/sn9c102
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-08-23 07:32:09 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-12 07:36:54 -0400
commitc170ecf434bceb0e188b14a6deb3bfa3ec9ef699 (patch)
treefa62c2e14adeff72310c9a6b8cba675f3153feed /drivers/media/video/sn9c102
parentbfa8a273bb91078ea193ab94c717889928f3b925 (diff)
V4L/DVB (8788): v4l: replace video_get_drvdata(video_devdata(filp)) with video_drvdata(filp)
Use the new video_drvdata(filp) function where it is safe to do so. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/sn9c102')
-rw-r--r--drivers/media/video/sn9c102/sn9c102_core.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/video/sn9c102/sn9c102_core.c b/drivers/media/video/sn9c102/sn9c102_core.c
index 2da6938718f2..4b76c45c148c 100644
--- a/drivers/media/video/sn9c102/sn9c102_core.c
+++ b/drivers/media/video/sn9c102/sn9c102_core.c
@@ -1746,7 +1746,7 @@ static int sn9c102_open(struct inode* inode, struct file* filp)
1746 if (!down_read_trylock(&sn9c102_dev_lock)) 1746 if (!down_read_trylock(&sn9c102_dev_lock))
1747 return -ERESTARTSYS; 1747 return -ERESTARTSYS;
1748 1748
1749 cam = video_get_drvdata(video_devdata(filp)); 1749 cam = video_drvdata(filp);
1750 1750
1751 if (wait_for_completion_interruptible(&cam->probe)) { 1751 if (wait_for_completion_interruptible(&cam->probe)) {
1752 up_read(&sn9c102_dev_lock); 1752 up_read(&sn9c102_dev_lock);
@@ -1843,7 +1843,7 @@ static int sn9c102_release(struct inode* inode, struct file* filp)
1843 1843
1844 down_write(&sn9c102_dev_lock); 1844 down_write(&sn9c102_dev_lock);
1845 1845
1846 cam = video_get_drvdata(video_devdata(filp)); 1846 cam = video_drvdata(filp);
1847 1847
1848 sn9c102_stop_transfer(cam); 1848 sn9c102_stop_transfer(cam);
1849 sn9c102_release_buffers(cam); 1849 sn9c102_release_buffers(cam);
@@ -1863,7 +1863,7 @@ static int sn9c102_release(struct inode* inode, struct file* filp)
1863static ssize_t 1863static ssize_t
1864sn9c102_read(struct file* filp, char __user * buf, size_t count, loff_t* f_pos) 1864sn9c102_read(struct file* filp, char __user * buf, size_t count, loff_t* f_pos)
1865{ 1865{
1866 struct sn9c102_device* cam = video_get_drvdata(video_devdata(filp)); 1866 struct sn9c102_device *cam = video_drvdata(filp);
1867 struct sn9c102_frame_t* f, * i; 1867 struct sn9c102_frame_t* f, * i;
1868 unsigned long lock_flags; 1868 unsigned long lock_flags;
1869 long timeout; 1869 long timeout;
@@ -1987,7 +1987,7 @@ exit:
1987 1987
1988static unsigned int sn9c102_poll(struct file *filp, poll_table *wait) 1988static unsigned int sn9c102_poll(struct file *filp, poll_table *wait)
1989{ 1989{
1990 struct sn9c102_device* cam = video_get_drvdata(video_devdata(filp)); 1990 struct sn9c102_device *cam = video_drvdata(filp);
1991 struct sn9c102_frame_t* f; 1991 struct sn9c102_frame_t* f;
1992 unsigned long lock_flags; 1992 unsigned long lock_flags;
1993 unsigned int mask = 0; 1993 unsigned int mask = 0;
@@ -2063,7 +2063,7 @@ static struct vm_operations_struct sn9c102_vm_ops = {
2063 2063
2064static int sn9c102_mmap(struct file* filp, struct vm_area_struct *vma) 2064static int sn9c102_mmap(struct file* filp, struct vm_area_struct *vma)
2065{ 2065{
2066 struct sn9c102_device* cam = video_get_drvdata(video_devdata(filp)); 2066 struct sn9c102_device *cam = video_drvdata(filp);
2067 unsigned long size = vma->vm_end - vma->vm_start, 2067 unsigned long size = vma->vm_end - vma->vm_start,
2068 start = vma->vm_start; 2068 start = vma->vm_start;
2069 void *pos; 2069 void *pos;
@@ -3075,7 +3075,7 @@ sn9c102_vidioc_s_audio(struct sn9c102_device* cam, void __user * arg)
3075static int sn9c102_ioctl_v4l2(struct inode* inode, struct file* filp, 3075static int sn9c102_ioctl_v4l2(struct inode* inode, struct file* filp,
3076 unsigned int cmd, void __user * arg) 3076 unsigned int cmd, void __user * arg)
3077{ 3077{
3078 struct sn9c102_device* cam = video_get_drvdata(video_devdata(filp)); 3078 struct sn9c102_device *cam = video_drvdata(filp);
3079 3079
3080 switch (cmd) { 3080 switch (cmd) {
3081 3081
@@ -3179,7 +3179,7 @@ static int sn9c102_ioctl_v4l2(struct inode* inode, struct file* filp,
3179static int sn9c102_ioctl(struct inode* inode, struct file* filp, 3179static int sn9c102_ioctl(struct inode* inode, struct file* filp,
3180 unsigned int cmd, unsigned long arg) 3180 unsigned int cmd, unsigned long arg)
3181{ 3181{
3182 struct sn9c102_device* cam = video_get_drvdata(video_devdata(filp)); 3182 struct sn9c102_device *cam = video_drvdata(filp);
3183 int err = 0; 3183 int err = 0;
3184 3184
3185 if (mutex_lock_interruptible(&cam->fileop_mutex)) 3185 if (mutex_lock_interruptible(&cam->fileop_mutex))