diff options
Diffstat (limited to 'drivers/media/radio/dsbr100.c')
| -rw-r--r-- | drivers/media/radio/dsbr100.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/media/radio/dsbr100.c b/drivers/media/radio/dsbr100.c index 5474a22c1b22..2014ebc4e984 100644 --- a/drivers/media/radio/dsbr100.c +++ b/drivers/media/radio/dsbr100.c | |||
| @@ -154,8 +154,8 @@ devices, that would be 76 and 91. */ | |||
| 154 | static int usb_dsbr100_probe(struct usb_interface *intf, | 154 | static int usb_dsbr100_probe(struct usb_interface *intf, |
| 155 | const struct usb_device_id *id); | 155 | const struct usb_device_id *id); |
| 156 | static void usb_dsbr100_disconnect(struct usb_interface *intf); | 156 | static void usb_dsbr100_disconnect(struct usb_interface *intf); |
| 157 | static int usb_dsbr100_open(struct inode *inode, struct file *file); | 157 | static int usb_dsbr100_open(struct file *file); |
| 158 | static int usb_dsbr100_close(struct inode *inode, struct file *file); | 158 | static int usb_dsbr100_close(struct file *file); |
| 159 | static int usb_dsbr100_suspend(struct usb_interface *intf, | 159 | static int usb_dsbr100_suspend(struct usb_interface *intf, |
| 160 | pm_message_t message); | 160 | pm_message_t message); |
| 161 | static int usb_dsbr100_resume(struct usb_interface *intf); | 161 | static int usb_dsbr100_resume(struct usb_interface *intf); |
| @@ -566,7 +566,7 @@ static int vidioc_s_audio(struct file *file, void *priv, | |||
| 566 | return 0; | 566 | return 0; |
| 567 | } | 567 | } |
| 568 | 568 | ||
| 569 | static int usb_dsbr100_open(struct inode *inode, struct file *file) | 569 | static int usb_dsbr100_open(struct file *file) |
| 570 | { | 570 | { |
| 571 | struct dsbr100_device *radio = video_drvdata(file); | 571 | struct dsbr100_device *radio = video_drvdata(file); |
| 572 | int retval; | 572 | int retval; |
| @@ -593,7 +593,7 @@ static int usb_dsbr100_open(struct inode *inode, struct file *file) | |||
| 593 | return 0; | 593 | return 0; |
| 594 | } | 594 | } |
| 595 | 595 | ||
| 596 | static int usb_dsbr100_close(struct inode *inode, struct file *file) | 596 | static int usb_dsbr100_close(struct file *file) |
| 597 | { | 597 | { |
| 598 | struct dsbr100_device *radio = video_drvdata(file); | 598 | struct dsbr100_device *radio = video_drvdata(file); |
| 599 | int retval; | 599 | int retval; |
| @@ -653,15 +653,11 @@ static void usb_dsbr100_video_device_release(struct video_device *videodev) | |||
| 653 | } | 653 | } |
| 654 | 654 | ||
| 655 | /* File system interface */ | 655 | /* File system interface */ |
| 656 | static const struct file_operations usb_dsbr100_fops = { | 656 | static const struct v4l2_file_operations usb_dsbr100_fops = { |
| 657 | .owner = THIS_MODULE, | 657 | .owner = THIS_MODULE, |
| 658 | .open = usb_dsbr100_open, | 658 | .open = usb_dsbr100_open, |
| 659 | .release = usb_dsbr100_close, | 659 | .release = usb_dsbr100_close, |
| 660 | .ioctl = video_ioctl2, | 660 | .ioctl = video_ioctl2, |
| 661 | #ifdef CONFIG_COMPAT | ||
| 662 | .compat_ioctl = v4l_compat_ioctl32, | ||
| 663 | #endif | ||
| 664 | .llseek = no_llseek, | ||
| 665 | }; | 661 | }; |
| 666 | 662 | ||
| 667 | static const struct v4l2_ioctl_ops usb_dsbr100_ioctl_ops = { | 663 | static const struct v4l2_ioctl_ops usb_dsbr100_ioctl_ops = { |
