diff options
Diffstat (limited to 'drivers/media/video/stradis.c')
-rw-r--r-- | drivers/media/video/stradis.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/drivers/media/video/stradis.c b/drivers/media/video/stradis.c index bbad54f85c83..10d2608501ae 100644 --- a/drivers/media/video/stradis.c +++ b/drivers/media/video/stradis.c | |||
@@ -1275,7 +1275,7 @@ static void make_clip_tab(struct saa7146 *saa, struct video_clip *cr, int ncr) | |||
1275 | clip_draw_rectangle(clipmap, 0, 0, 1024, -saa->win.y); | 1275 | clip_draw_rectangle(clipmap, 0, 0, 1024, -saa->win.y); |
1276 | } | 1276 | } |
1277 | 1277 | ||
1278 | static int saa_ioctl(struct inode *inode, struct file *file, | 1278 | static int saa_ioctl(struct file *file, |
1279 | unsigned int cmd, unsigned long argl) | 1279 | unsigned int cmd, unsigned long argl) |
1280 | { | 1280 | { |
1281 | struct saa7146 *saa = file->private_data; | 1281 | struct saa7146 *saa = file->private_data; |
@@ -1877,7 +1877,7 @@ static ssize_t saa_write(struct file *file, const char __user * buf, | |||
1877 | return count; | 1877 | return count; |
1878 | } | 1878 | } |
1879 | 1879 | ||
1880 | static int saa_open(struct inode *inode, struct file *file) | 1880 | static int saa_open(struct file *file) |
1881 | { | 1881 | { |
1882 | struct video_device *vdev = video_devdata(file); | 1882 | struct video_device *vdev = video_devdata(file); |
1883 | struct saa7146 *saa = container_of(vdev, struct saa7146, video_dev); | 1883 | struct saa7146 *saa = container_of(vdev, struct saa7146, video_dev); |
@@ -1895,7 +1895,7 @@ static int saa_open(struct inode *inode, struct file *file) | |||
1895 | return 0; | 1895 | return 0; |
1896 | } | 1896 | } |
1897 | 1897 | ||
1898 | static int saa_release(struct inode *inode, struct file *file) | 1898 | static int saa_release(struct file *file) |
1899 | { | 1899 | { |
1900 | struct saa7146 *saa = file->private_data; | 1900 | struct saa7146 *saa = file->private_data; |
1901 | saa->user--; | 1901 | saa->user--; |
@@ -1906,16 +1906,12 @@ static int saa_release(struct inode *inode, struct file *file) | |||
1906 | return 0; | 1906 | return 0; |
1907 | } | 1907 | } |
1908 | 1908 | ||
1909 | static const struct file_operations saa_fops = { | 1909 | static const struct v4l2_file_operations saa_fops = { |
1910 | .owner = THIS_MODULE, | 1910 | .owner = THIS_MODULE, |
1911 | .open = saa_open, | 1911 | .open = saa_open, |
1912 | .release = saa_release, | 1912 | .release = saa_release, |
1913 | .ioctl = saa_ioctl, | 1913 | .ioctl = saa_ioctl, |
1914 | #ifdef CONFIG_COMPAT | ||
1915 | .compat_ioctl = v4l_compat_ioctl32, | ||
1916 | #endif | ||
1917 | .read = saa_read, | 1914 | .read = saa_read, |
1918 | .llseek = no_llseek, | ||
1919 | .write = saa_write, | 1915 | .write = saa_write, |
1920 | .mmap = saa_mmap, | 1916 | .mmap = saa_mmap, |
1921 | }; | 1917 | }; |