diff options
| author | Hans Verkuil <hans.verkuil@cisco.com> | 2012-04-29 15:47:47 -0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-05-14 13:54:58 -0400 |
| commit | 6e65ca942b9664a987866ac0c62e7e450777056b (patch) | |
| tree | fcd78f02819a1d3d0559ab51a8bb87412d911783 /include/media | |
| parent | 5becbc58a01f1adaf34703c18287d9f7b46a17f6 (diff) | |
[media] mxb/saa7146: first round of cleanups
Convert to the control framework, fix the easy v4l2-compliance failures.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/saa7146.h | 2 | ||||
| -rw-r--r-- | include/media/saa7146_vv.h | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/include/media/saa7146.h b/include/media/saa7146.h index 0f037e8edf9a..c791940c579b 100644 --- a/include/media/saa7146.h +++ b/include/media/saa7146.h | |||
| @@ -13,6 +13,7 @@ | |||
| 13 | #include <linux/mutex.h> | 13 | #include <linux/mutex.h> |
| 14 | #include <linux/scatterlist.h> | 14 | #include <linux/scatterlist.h> |
| 15 | #include <media/v4l2-device.h> | 15 | #include <media/v4l2-device.h> |
| 16 | #include <media/v4l2-ctrls.h> | ||
| 16 | 17 | ||
| 17 | #include <linux/vmalloc.h> /* for vmalloc() */ | 18 | #include <linux/vmalloc.h> /* for vmalloc() */ |
| 18 | #include <linux/mm.h> /* for vmalloc_to_page() */ | 19 | #include <linux/mm.h> /* for vmalloc_to_page() */ |
| @@ -121,6 +122,7 @@ struct saa7146_dev | |||
| 121 | struct list_head item; | 122 | struct list_head item; |
| 122 | 123 | ||
| 123 | struct v4l2_device v4l2_dev; | 124 | struct v4l2_device v4l2_dev; |
| 125 | struct v4l2_ctrl_handler ctrl_handler; | ||
| 124 | 126 | ||
| 125 | /* different device locks */ | 127 | /* different device locks */ |
| 126 | spinlock_t slock; | 128 | spinlock_t slock; |
diff --git a/include/media/saa7146_vv.h b/include/media/saa7146_vv.h index 4aeff96ff7d8..b4761edafa69 100644 --- a/include/media/saa7146_vv.h +++ b/include/media/saa7146_vv.h | |||
| @@ -206,6 +206,7 @@ extern struct saa7146_use_ops saa7146_video_uops; | |||
| 206 | int saa7146_start_preview(struct saa7146_fh *fh); | 206 | int saa7146_start_preview(struct saa7146_fh *fh); |
| 207 | int saa7146_stop_preview(struct saa7146_fh *fh); | 207 | int saa7146_stop_preview(struct saa7146_fh *fh); |
| 208 | long saa7146_video_do_ioctl(struct file *file, unsigned int cmd, void *arg); | 208 | long saa7146_video_do_ioctl(struct file *file, unsigned int cmd, void *arg); |
| 209 | int saa7146_s_ctrl(struct v4l2_ctrl *ctrl); | ||
| 209 | 210 | ||
| 210 | /* from saa7146_vbi.c */ | 211 | /* from saa7146_vbi.c */ |
| 211 | extern struct saa7146_use_ops saa7146_vbi_uops; | 212 | extern struct saa7146_use_ops saa7146_vbi_uops; |
