diff options
| author | Guennadi Liakhovetski <lyakh@axis700.grange> | 2008-12-01 07:45:21 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-12-30 06:38:23 -0500 |
| commit | d8fac217c58f0101a351b9c8c80f1665bd9efef9 (patch) | |
| tree | 5b6b71e7f7cacf81620c046b5944134db2d70734 /include | |
| parent | 25c4d74ea6f07f2aaa3df537619680ba967043f5 (diff) | |
V4L/DVB (9788): soc-camera: simplify naming
We anyway don't follow the s_fmt_vid_cap / g_fmt_vid_cap / try_fmt_vid_cap
naming, and soc-camera is so far only about video capture, let's simplify
operation names a bit further. set_fmt_cap / try_fmt_cap wasn't a very good
choice too.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/soc_camera.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h index 8e8fcb75dacb..b14f6ddc9e18 100644 --- a/include/media/soc_camera.h +++ b/include/media/soc_camera.h | |||
| @@ -66,9 +66,8 @@ struct soc_camera_host_ops { | |||
| 66 | void (*remove)(struct soc_camera_device *); | 66 | void (*remove)(struct soc_camera_device *); |
| 67 | int (*suspend)(struct soc_camera_device *, pm_message_t state); | 67 | int (*suspend)(struct soc_camera_device *, pm_message_t state); |
| 68 | int (*resume)(struct soc_camera_device *); | 68 | int (*resume)(struct soc_camera_device *); |
| 69 | int (*set_fmt_cap)(struct soc_camera_device *, __u32, | 69 | int (*set_fmt)(struct soc_camera_device *, __u32, struct v4l2_rect *); |
| 70 | struct v4l2_rect *); | 70 | int (*try_fmt)(struct soc_camera_device *, struct v4l2_format *); |
| 71 | int (*try_fmt_cap)(struct soc_camera_device *, struct v4l2_format *); | ||
| 72 | void (*init_videobuf)(struct videobuf_queue *, | 71 | void (*init_videobuf)(struct videobuf_queue *, |
| 73 | struct soc_camera_device *); | 72 | struct soc_camera_device *); |
| 74 | int (*reqbufs)(struct soc_camera_file *, struct v4l2_requestbuffers *); | 73 | int (*reqbufs)(struct soc_camera_file *, struct v4l2_requestbuffers *); |
| @@ -125,9 +124,8 @@ struct soc_camera_ops { | |||
| 125 | int (*release)(struct soc_camera_device *); | 124 | int (*release)(struct soc_camera_device *); |
| 126 | int (*start_capture)(struct soc_camera_device *); | 125 | int (*start_capture)(struct soc_camera_device *); |
| 127 | int (*stop_capture)(struct soc_camera_device *); | 126 | int (*stop_capture)(struct soc_camera_device *); |
| 128 | int (*set_fmt_cap)(struct soc_camera_device *, __u32, | 127 | int (*set_fmt)(struct soc_camera_device *, __u32, struct v4l2_rect *); |
| 129 | struct v4l2_rect *); | 128 | int (*try_fmt)(struct soc_camera_device *, struct v4l2_format *); |
| 130 | int (*try_fmt_cap)(struct soc_camera_device *, struct v4l2_format *); | ||
| 131 | unsigned long (*query_bus_param)(struct soc_camera_device *); | 129 | unsigned long (*query_bus_param)(struct soc_camera_device *); |
| 132 | int (*set_bus_param)(struct soc_camera_device *, unsigned long); | 130 | int (*set_bus_param)(struct soc_camera_device *, unsigned long); |
| 133 | int (*get_chip_id)(struct soc_camera_device *, | 131 | int (*get_chip_id)(struct soc_camera_device *, |