diff options
Diffstat (limited to 'drivers/media/video/se401.c')
-rw-r--r-- | drivers/media/video/se401.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/drivers/media/video/se401.c b/drivers/media/video/se401.c index d652f25eef0e..5990ab38a124 100644 --- a/drivers/media/video/se401.c +++ b/drivers/media/video/se401.c | |||
@@ -932,7 +932,7 @@ static void usb_se401_remove_disconnected (struct usb_se401 *se401) | |||
932 | ***************************************************************************/ | 932 | ***************************************************************************/ |
933 | 933 | ||
934 | 934 | ||
935 | static int se401_open(struct inode *inode, struct file *file) | 935 | static int se401_open(struct file *file) |
936 | { | 936 | { |
937 | struct video_device *dev = video_devdata(file); | 937 | struct video_device *dev = video_devdata(file); |
938 | struct usb_se401 *se401 = (struct usb_se401 *)dev; | 938 | struct usb_se401 *se401 = (struct usb_se401 *)dev; |
@@ -954,7 +954,7 @@ static int se401_open(struct inode *inode, struct file *file) | |||
954 | return err; | 954 | return err; |
955 | } | 955 | } |
956 | 956 | ||
957 | static int se401_close(struct inode *inode, struct file *file) | 957 | static int se401_close(struct file *file) |
958 | { | 958 | { |
959 | struct video_device *dev = file->private_data; | 959 | struct video_device *dev = file->private_data; |
960 | struct usb_se401 *se401 = (struct usb_se401 *)dev; | 960 | struct usb_se401 *se401 = (struct usb_se401 *)dev; |
@@ -975,7 +975,7 @@ static int se401_close(struct inode *inode, struct file *file) | |||
975 | return 0; | 975 | return 0; |
976 | } | 976 | } |
977 | 977 | ||
978 | static int se401_do_ioctl(struct file *file, unsigned int cmd, void *arg) | 978 | static long se401_do_ioctl(struct file *file, unsigned int cmd, void *arg) |
979 | { | 979 | { |
980 | struct video_device *vdev = file->private_data; | 980 | struct video_device *vdev = file->private_data; |
981 | struct usb_se401 *se401 = (struct usb_se401 *)vdev; | 981 | struct usb_se401 *se401 = (struct usb_se401 *)vdev; |
@@ -1138,7 +1138,7 @@ static int se401_do_ioctl(struct file *file, unsigned int cmd, void *arg) | |||
1138 | return 0; | 1138 | return 0; |
1139 | } | 1139 | } |
1140 | 1140 | ||
1141 | static int se401_ioctl(struct inode *inode, struct file *file, | 1141 | static long se401_ioctl(struct file *file, |
1142 | unsigned int cmd, unsigned long arg) | 1142 | unsigned int cmd, unsigned long arg) |
1143 | { | 1143 | { |
1144 | return video_usercopy(file, cmd, arg, se401_do_ioctl); | 1144 | return video_usercopy(file, cmd, arg, se401_do_ioctl); |
@@ -1222,17 +1222,13 @@ static int se401_mmap(struct file *file, struct vm_area_struct *vma) | |||
1222 | return 0; | 1222 | return 0; |
1223 | } | 1223 | } |
1224 | 1224 | ||
1225 | static const struct file_operations se401_fops = { | 1225 | static const struct v4l2_file_operations se401_fops = { |
1226 | .owner = THIS_MODULE, | 1226 | .owner = THIS_MODULE, |
1227 | .open = se401_open, | 1227 | .open = se401_open, |
1228 | .release = se401_close, | 1228 | .release = se401_close, |
1229 | .read = se401_read, | 1229 | .read = se401_read, |
1230 | .mmap = se401_mmap, | 1230 | .mmap = se401_mmap, |
1231 | .ioctl = se401_ioctl, | 1231 | .ioctl = se401_ioctl, |
1232 | #ifdef CONFIG_COMPAT | ||
1233 | .compat_ioctl = v4l_compat_ioctl32, | ||
1234 | #endif | ||
1235 | .llseek = no_llseek, | ||
1236 | }; | 1232 | }; |
1237 | static struct video_device se401_template = { | 1233 | static struct video_device se401_template = { |
1238 | .name = "se401 USB camera", | 1234 | .name = "se401 USB camera", |