[media] v4l2: replace s_mbus_fmt by set_fmt

The s_mbus_fmt video op is a duplicate of the pad op. Replace all uses
in sub-devices by the set_fmt() pad op.

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

1 files changed, 12 insertions, 3 deletions

diff --git a/drivers/media/i2c/cx25840/cx25840-core.c b/drivers/media/i2c/cx25840/cx25840-core.c
index 18e3615737f2..e15a789ad596 100644
--- a/drivers/media/i2c/cx25840/cx25840-core.c
+++ b/drivers/media/i2c/cx25840/cx25840-core.c
@@ -1366,14 +1366,17 @@ static int cx25840_s_ctrl(struct v4l2_ctrl *ctrl)
 
 /* ----------------------------------------------------------------------- */
 
-static int cx25840_s_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *fmt)
+static int cx25840_set_fmt(struct v4l2_subdev *sd,
+                struct v4l2_subdev_pad_config *cfg,
+                struct v4l2_subdev_format *format)
 {
+        struct v4l2_mbus_framefmt *fmt = &format->format;
         struct cx25840_state *state = to_state(sd);
         struct i2c_client *client = v4l2_get_subdevdata(sd);
         int HSC, VSC, Vsrc, Hsrc, filter, Vlines;
         int is_50Hz = !(state->std & V4L2_STD_525_60);
 
-        if (fmt->code != MEDIA_BUS_FMT_FIXED)
+        if (format->pad || fmt->code != MEDIA_BUS_FMT_FIXED)
                 return -EINVAL;
 
         fmt->field = V4L2_FIELD_INTERLACED;
@@ -1403,6 +1406,8 @@ static int cx25840_s_mbus_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt
                                 fmt->width, fmt->height);
                 return -ERANGE;
         }
+        if (format->which == V4L2_SUBDEV_FORMAT_TRY)
+                return 0;
 
         HSC = (Hsrc * (1 << 20)) / fmt->width - (1 << 20);
         VSC = (1 << 16) - (Vsrc * (1 << 9) / Vlines - (1 << 9));
@@ -5068,7 +5073,6 @@ static const struct v4l2_subdev_video_ops cx25840_video_ops = {
         .s_std = cx25840_s_std,
         .g_std = cx25840_g_std,
         .s_routing = cx25840_s_video_routing,
-        .s_mbus_fmt = cx25840_s_mbus_fmt,
         .s_stream = cx25840_s_stream,
         .g_input_status = cx25840_g_input_status,
 };
@@ -5080,12 +5084,17 @@ static const struct v4l2_subdev_vbi_ops cx25840_vbi_ops = {
         .g_sliced_fmt = cx25840_g_sliced_fmt,
 };
 
+static const struct v4l2_subdev_pad_ops cx25840_pad_ops = {
+        .set_fmt = cx25840_set_fmt,
+};
+
 static const struct v4l2_subdev_ops cx25840_ops = {
         .core = &cx25840_core_ops,
         .tuner = &cx25840_tuner_ops,
         .audio = &cx25840_audio_ops,
         .video = &cx25840_video_ops,
         .vbi = &cx25840_vbi_ops,
+        .pad = &cx25840_pad_ops,
         .ir = &cx25840_ir_ops,
 };