[media] v4l2: replace enum_mbus_fmt by enum_mbus_code

Replace all calls to the enum_mbus_fmt video op by the pad
enum_mbus_code op and remove the duplicate video op.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Scott Jiang <scott.jiang.linux@gmail.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Kamil Debski <k.debski@samsung.com>
Acked-by: Prabhakar Lad <prabhakar.csengg@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

1 files changed, 10 insertions, 5 deletions

diff --git a/drivers/media/platform/soc_camera/soc_camera.c b/drivers/media/platform/soc_camera/soc_camera.c
index 7bfe7665687f..7fd49cb009d3 100644
--- a/drivers/media/platform/soc_camera/soc_camera.c
+++ b/drivers/media/platform/soc_camera/soc_camera.c
@@ -484,10 +484,14 @@ static int soc_camera_init_user_formats(struct soc_camera_device *icd)
         struct soc_camera_host *ici = to_soc_camera_host(icd->parent);
         unsigned int i, fmts = 0, raw_fmts = 0;
         int ret;
-        u32 code;
+        struct v4l2_subdev_mbus_code_enum code = {
+                .which = V4L2_SUBDEV_FORMAT_ACTIVE,
+        };
 
-        while (!v4l2_subdev_call(sd, video, enum_mbus_fmt, raw_fmts, &code))
+        while (!v4l2_subdev_call(sd, pad, enum_mbus_code, NULL, &code)) {
                 raw_fmts++;
+                code.index++;
+        }
 
         if (!ici->ops->get_formats)
                 /*
@@ -521,11 +525,12 @@ static int soc_camera_init_user_formats(struct soc_camera_device *icd)
         fmts = 0;
         for (i = 0; i < raw_fmts; i++)
                 if (!ici->ops->get_formats) {
-                        v4l2_subdev_call(sd, video, enum_mbus_fmt, i, &code);
+                        code.index = i;
+                        v4l2_subdev_call(sd, pad, enum_mbus_code, NULL, &code);
                         icd->user_formats[fmts].host_fmt =
-                                soc_mbus_get_fmtdesc(code);
+                                soc_mbus_get_fmtdesc(code.code);
                         if (icd->user_formats[fmts].host_fmt)
-                                icd->user_formats[fmts++].code = code;
+                                icd->user_formats[fmts++].code = code.code;
                 } else {
                         ret = ici->ops->get_formats(icd, i,
                                                     &icd->user_formats[fmts]);