media: v4l: subdev: v4l2_subdev_state_get_format always returns format now

Now that v4l2_subdev_state_get_format() always returns format, don't call
alternative v4l2_subdev_get_pad_format() anymore.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/v4l2-core/v4l2-subdev.c b/drivers/media/v4l2-core/v4l2-subdev.c
index a6f480ef788115649a3de8958cdbabb07cefce17..9eef170934c51eff10e3cd6268acb0ba1b883664 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-subdev.c
+++ b/drivers/media/v4l2-core/v4l2-subdev.c
@@ -1587,14 +1587,7 @@ int v4l2_subdev_get_fmt(struct v4l2_subdev *sd, struct v4l2_subdev_state *state,
 {
        struct v4l2_mbus_framefmt *fmt;
 
-       if (sd->flags & V4L2_SUBDEV_FL_STREAMS)
-               fmt = v4l2_subdev_state_get_format(state, format->pad,
-                                                  format->stream);
-       else if (format->pad < sd->entity.num_pads && format->stream == 0)
-               fmt = v4l2_subdev_get_pad_format(sd, state, format->pad);
-       else
-               fmt = NULL;
-
+       fmt = v4l2_subdev_state_get_format(state, format->pad, format->stream);
        if (!fmt)
                return -EINVAL;