diff options
Diffstat (limited to 'drivers/media/video/saa5249.c')
-rw-r--r-- | drivers/media/video/saa5249.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c index 6ef3affb97f1..e73bb738933c 100644 --- a/drivers/media/video/saa5249.c +++ b/drivers/media/video/saa5249.c | |||
@@ -479,7 +479,7 @@ static inline unsigned int vtx_fix_command(unsigned int cmd) | |||
479 | * Handle the locking | 479 | * Handle the locking |
480 | */ | 480 | */ |
481 | 481 | ||
482 | static int saa5249_ioctl(struct inode *inode, struct file *file, | 482 | static int saa5249_ioctl(struct file *file, |
483 | unsigned int cmd, unsigned long arg) | 483 | unsigned int cmd, unsigned long arg) |
484 | { | 484 | { |
485 | struct saa5249_device *t = video_drvdata(file); | 485 | struct saa5249_device *t = video_drvdata(file); |
@@ -492,7 +492,7 @@ static int saa5249_ioctl(struct inode *inode, struct file *file, | |||
492 | return err; | 492 | return err; |
493 | } | 493 | } |
494 | 494 | ||
495 | static int saa5249_open(struct inode *inode, struct file *file) | 495 | static int saa5249_open(struct file *file) |
496 | { | 496 | { |
497 | struct saa5249_device *t = video_drvdata(file); | 497 | struct saa5249_device *t = video_drvdata(file); |
498 | int pgbuf; | 498 | int pgbuf; |
@@ -529,7 +529,7 @@ static int saa5249_open(struct inode *inode, struct file *file) | |||
529 | 529 | ||
530 | 530 | ||
531 | 531 | ||
532 | static int saa5249_release(struct inode *inode, struct file *file) | 532 | static int saa5249_release(struct file *file) |
533 | { | 533 | { |
534 | struct saa5249_device *t = video_drvdata(file); | 534 | struct saa5249_device *t = video_drvdata(file); |
535 | 535 | ||
@@ -539,15 +539,11 @@ static int saa5249_release(struct inode *inode, struct file *file) | |||
539 | return 0; | 539 | return 0; |
540 | } | 540 | } |
541 | 541 | ||
542 | static const struct file_operations saa_fops = { | 542 | static const struct v4l2_file_operations saa_fops = { |
543 | .owner = THIS_MODULE, | 543 | .owner = THIS_MODULE, |
544 | .open = saa5249_open, | 544 | .open = saa5249_open, |
545 | .release = saa5249_release, | 545 | .release = saa5249_release, |
546 | .ioctl = saa5249_ioctl, | 546 | .ioctl = saa5249_ioctl, |
547 | #ifdef CONFIG_COMPAT | ||
548 | .compat_ioctl = v4l_compat_ioctl32, | ||
549 | #endif | ||
550 | .llseek = no_llseek, | ||
551 | }; | 547 | }; |
552 | 548 | ||
553 | static struct video_device saa_template = | 549 | static struct video_device saa_template = |