aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/arv.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/arv.c')
-rw-r--r--drivers/media/video/arv.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/media/video/arv.c b/drivers/media/video/arv.c
index 0d4f9b68345..218754b4906 100644
--- a/drivers/media/video/arv.c
+++ b/drivers/media/video/arv.c
@@ -270,7 +270,7 @@ static inline void wait_for_vertical_sync(int exp_line)
270static ssize_t ar_read(struct file *file, char *buf, size_t count, loff_t *ppos) 270static ssize_t ar_read(struct file *file, char *buf, size_t count, loff_t *ppos)
271{ 271{
272 struct video_device *v = video_devdata(file); 272 struct video_device *v = video_devdata(file);
273 struct ar_device *ar = v->priv; 273 struct ar_device *ar = video_get_drvdata(v);
274 long ret = ar->frame_bytes; /* return read bytes */ 274 long ret = ar->frame_bytes; /* return read bytes */
275 unsigned long arvcr1 = 0; 275 unsigned long arvcr1 = 0;
276 unsigned long flags; 276 unsigned long flags;
@@ -400,7 +400,7 @@ static int ar_do_ioctl(struct inode *inode, struct file *file,
400 unsigned int cmd, void *arg) 400 unsigned int cmd, void *arg)
401{ 401{
402 struct video_device *dev = video_devdata(file); 402 struct video_device *dev = video_devdata(file);
403 struct ar_device *ar = dev->priv; 403 struct ar_device *ar = video_get_drvdata(dev);
404 404
405 DEBUG(1, "ar_ioctl()\n"); 405 DEBUG(1, "ar_ioctl()\n");
406 switch(cmd) { 406 switch(cmd) {
@@ -626,7 +626,7 @@ static void ar_interrupt(int irq, void *dev)
626 */ 626 */
627static int ar_initialize(struct video_device *dev) 627static int ar_initialize(struct video_device *dev)
628{ 628{
629 struct ar_device *ar = dev->priv; 629 struct ar_device *ar = video_get_drvdata(dev);
630 unsigned long cr = 0; 630 unsigned long cr = 0;
631 int i,found=0; 631 int i,found=0;
632 632
@@ -733,7 +733,7 @@ static int ar_initialize(struct video_device *dev)
733 733
734void ar_release(struct video_device *vfd) 734void ar_release(struct video_device *vfd)
735{ 735{
736 struct ar_device *ar = vfd->priv; 736 struct ar_device *ar = video_get_drvdata(vfd);
737 mutex_lock(&ar->lock); 737 mutex_lock(&ar->lock);
738 video_device_release(vfd); 738 video_device_release(vfd);
739} 739}
@@ -815,7 +815,7 @@ static int __init ar_init(void)
815 return -ENOMEM; 815 return -ENOMEM;
816 } 816 }
817 memcpy(ar->vdev, &ar_template, sizeof(ar_template)); 817 memcpy(ar->vdev, &ar_template, sizeof(ar_template));
818 ar->vdev->priv = ar; 818 video_set_drvdata(ar->vdev, ar);
819 819
820 if (vga) { 820 if (vga) {
821 ar->width = AR_WIDTH_VGA; 821 ar->width = AR_WIDTH_VGA;