media: ccs: Remove which parameter from ccs_propagate

ccs_propagate() no longer stores information in the driver's context
struct. The which parameter can thus be removed.

Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>

diff --git a/drivers/media/i2c/ccs/ccs-core.c b/drivers/media/i2c/ccs/ccs-core.c
index 4a680f3f34e5747b13d5daff41a54964dec8106f..062c70b0a47d1a4e936f6b94383d817ee8da1821 100644 (file)
--- a/drivers/media/i2c/ccs/ccs-core.c
+++ b/drivers/media/i2c/ccs/ccs-core.c
@@ -2156,8 +2156,7 @@ static int ccs_get_format(struct v4l2_subdev *subdev,
 
 /* Changes require propagation only on sink pad. */
 static void ccs_propagate(struct v4l2_subdev *subdev,
-                         struct v4l2_subdev_state *sd_state, int which,
-                         int target)
+                         struct v4l2_subdev_state *sd_state, int target)
 {
        struct ccs_subdev *ssd = to_ccs_subdev(subdev);
        struct v4l2_rect *comp, *crop;
@@ -2278,7 +2277,7 @@ static int ccs_set_format(struct v4l2_subdev *subdev,
        crop->top = 0;
        crop->width = fmt->format.width;
        crop->height = fmt->format.height;
-       ccs_propagate(subdev, sd_state, fmt->which, V4L2_SEL_TGT_CROP);
+       ccs_propagate(subdev, sd_state, V4L2_SEL_TGT_CROP);
 
        return 0;
 }
@@ -2487,7 +2486,7 @@ static int ccs_set_compose(struct v4l2_subdev *subdev,
                ccs_set_compose_scaler(subdev, sd_state, sel, sink_crop);
 
        *comp = sel->r;
-       ccs_propagate(subdev, sd_state, sel->which, V4L2_SEL_TGT_COMPOSE);
+       ccs_propagate(subdev, sd_state, V4L2_SEL_TGT_COMPOSE);
 
        if (sel->which == V4L2_SUBDEV_FORMAT_ACTIVE)
                return ccs_pll_blanking_update(sensor);
@@ -2571,7 +2570,7 @@ static int ccs_set_crop(struct v4l2_subdev *subdev,
        *crop = sel->r;
 
        if (ssd != sensor->pixel_array && sel->pad == CCS_PAD_SINK)
-               ccs_propagate(subdev, sd_state, sel->which, V4L2_SEL_TGT_CROP);
+               ccs_propagate(subdev, sd_state, V4L2_SEL_TGT_CROP);
 
        return 0;
 }
@@ -3077,7 +3076,6 @@ static int ccs_init_state(struct v4l2_subdev *sd,
                v4l2_subdev_state_get_format(sd_state, pad);
        struct v4l2_rect *crop =
                v4l2_subdev_state_get_crop(sd_state, pad);
-       bool is_active = !sd->active_state || sd->active_state == sd_state;
 
        guard(mutex)(&sensor->mutex);
 
@@ -3096,7 +3094,7 @@ static int ccs_init_state(struct v4l2_subdev *sd,
                sensor->csi_format->code : sensor->internal_csi_format->code;
        fmt->field = V4L2_FIELD_NONE;
 
-       ccs_propagate(sd, sd_state, is_active, V4L2_SEL_TGT_CROP);
+       ccs_propagate(sd, sd_state, V4L2_SEL_TGT_CROP);
 
        return 0;
 }