V4L/DVB (7406): soc-camera: improve separation between soc_camera_ops and soc_camera_device

In case of muliple cameras, handled by the same driver, they can support

Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/include/media/soc_camera.h b/include/media/soc_camera.h
index 3e48e435b21a..7a2fa3ed849e 100644
--- a/include/media/soc_camera.h
+++ b/include/media/soc_camera.h
@@ -38,8 +38,8 @@ struct soc_camera_device {
         struct soc_camera_ops *ops;
         struct video_device *vdev;
         const struct soc_camera_data_format *current_fmt;
-        int (*probe)(struct soc_camera_device *icd);
-        void (*remove)(struct soc_camera_device *icd);
+        const struct soc_camera_data_format *formats;
+        int num_formats;
         struct module *owner;
         /* soc_camera.c private count. Only accessed with video_lock held */
         int use_count;
@@ -106,6 +106,8 @@ struct soc_camera_data_format {
 
 struct soc_camera_ops {
         struct module *owner;
+        int (*probe)(struct soc_camera_device *);
+        void (*remove)(struct soc_camera_device *);
         int (*init)(struct soc_camera_device *);
         int (*release)(struct soc_camera_device *);
         int (*start_capture)(struct soc_camera_device *);
@@ -121,8 +123,6 @@ struct soc_camera_ops {
         int (*get_register)(struct soc_camera_device *, struct v4l2_register *);
         int (*set_register)(struct soc_camera_device *, struct v4l2_register *);
 #endif
-        const struct soc_camera_data_format *formats;
-        int num_formats;
         int (*get_control)(struct soc_camera_device *, struct v4l2_control *);
         int (*set_control)(struct soc_camera_device *, struct v4l2_control *);
         const struct v4l2_queryctrl *controls;