diff options
Diffstat (limited to 'drivers/media/video/soc_camera.c')
-rw-r--r-- | drivers/media/video/soc_camera.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c index 90077cb4fe66..9986e02bcf1a 100644 --- a/drivers/media/video/soc_camera.c +++ b/drivers/media/video/soc_camera.c | |||
@@ -256,7 +256,7 @@ static void soc_camera_free_user_formats(struct soc_camera_device *icd) | |||
256 | vfree(icd->user_formats); | 256 | vfree(icd->user_formats); |
257 | } | 257 | } |
258 | 258 | ||
259 | static int soc_camera_open(struct inode *inode, struct file *file) | 259 | static int soc_camera_open(struct file *file) |
260 | { | 260 | { |
261 | struct video_device *vdev; | 261 | struct video_device *vdev; |
262 | struct soc_camera_device *icd; | 262 | struct soc_camera_device *icd; |
@@ -330,7 +330,7 @@ emgd: | |||
330 | return ret; | 330 | return ret; |
331 | } | 331 | } |
332 | 332 | ||
333 | static int soc_camera_close(struct inode *inode, struct file *file) | 333 | static int soc_camera_close(struct file *file) |
334 | { | 334 | { |
335 | struct soc_camera_file *icf = file->private_data; | 335 | struct soc_camera_file *icf = file->private_data; |
336 | struct soc_camera_device *icd = icf->icd; | 336 | struct soc_camera_device *icd = icf->icd; |
@@ -400,7 +400,7 @@ static unsigned int soc_camera_poll(struct file *file, poll_table *pt) | |||
400 | return ici->ops->poll(file, pt); | 400 | return ici->ops->poll(file, pt); |
401 | } | 401 | } |
402 | 402 | ||
403 | static struct file_operations soc_camera_fops = { | 403 | static struct v4l2_file_operations soc_camera_fops = { |
404 | .owner = THIS_MODULE, | 404 | .owner = THIS_MODULE, |
405 | .open = soc_camera_open, | 405 | .open = soc_camera_open, |
406 | .release = soc_camera_close, | 406 | .release = soc_camera_close, |
@@ -408,7 +408,6 @@ static struct file_operations soc_camera_fops = { | |||
408 | .read = soc_camera_read, | 408 | .read = soc_camera_read, |
409 | .mmap = soc_camera_mmap, | 409 | .mmap = soc_camera_mmap, |
410 | .poll = soc_camera_poll, | 410 | .poll = soc_camera_poll, |
411 | .llseek = no_llseek, | ||
412 | }; | 411 | }; |
413 | 412 | ||
414 | static int soc_camera_s_fmt_vid_cap(struct file *file, void *priv, | 413 | static int soc_camera_s_fmt_vid_cap(struct file *file, void *priv, |