aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/media/soc_camera.h10
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 *,