Hi Tomi,
Thank you for the patch.
On Thu, Apr 21, 2022 at 05:34:46PM +0300, Tomi Valkeinen wrote:
Maybe with a commit message ?
"There is no other state than the subdev state, shorten lines by
renaming the 'sd_state' function parameters to 'state'."
> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@xxxxxxxxxxxxxxxx>
Reviewed-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
> ---
> drivers/media/platform/ti/cal/cal-camerarx.c | 30 ++++++++++----------
> 1 file changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/media/platform/ti/cal/cal-camerarx.c b/drivers/media/platform/ti/cal/cal-camerarx.c
> index a41941fa819a..34b8542133b6 100644
> --- a/drivers/media/platform/ti/cal/cal-camerarx.c
> +++ b/drivers/media/platform/ti/cal/cal-camerarx.c
> @@ -595,12 +595,12 @@ static inline struct cal_camerarx *to_cal_camerarx(struct v4l2_subdev *sd)
>
> static struct v4l2_mbus_framefmt *
> cal_camerarx_get_pad_format(struct cal_camerarx *phy,
> - struct v4l2_subdev_state *sd_state,
> + struct v4l2_subdev_state *state,
> unsigned int pad, u32 which)
> {
> switch (which) {
> case V4L2_SUBDEV_FORMAT_TRY:
> - return v4l2_subdev_get_try_format(&phy->subdev, sd_state, pad);
> + return v4l2_subdev_get_try_format(&phy->subdev, state, pad);
> case V4L2_SUBDEV_FORMAT_ACTIVE:
> return &phy->formats[pad];
> default:
> @@ -626,7 +626,7 @@ static int cal_camerarx_sd_s_stream(struct v4l2_subdev *sd, int enable)
> }
>
> static int cal_camerarx_sd_enum_mbus_code(struct v4l2_subdev *sd,
> - struct v4l2_subdev_state *sd_state,
> + struct v4l2_subdev_state *state,
> struct v4l2_subdev_mbus_code_enum *code)
> {
> struct cal_camerarx *phy = to_cal_camerarx(sd);
> @@ -643,7 +643,7 @@ static int cal_camerarx_sd_enum_mbus_code(struct v4l2_subdev *sd,
> goto out;
> }
>
> - fmt = cal_camerarx_get_pad_format(phy, sd_state,
> + fmt = cal_camerarx_get_pad_format(phy, state,
> CAL_CAMERARX_PAD_SINK,
> code->which);
> code->code = fmt->code;
> @@ -663,7 +663,7 @@ static int cal_camerarx_sd_enum_mbus_code(struct v4l2_subdev *sd,
> }
>
> static int cal_camerarx_sd_enum_frame_size(struct v4l2_subdev *sd,
> - struct v4l2_subdev_state *sd_state,
> + struct v4l2_subdev_state *state,
> struct v4l2_subdev_frame_size_enum *fse)
> {
> struct cal_camerarx *phy = to_cal_camerarx(sd);
> @@ -679,7 +679,7 @@ static int cal_camerarx_sd_enum_frame_size(struct v4l2_subdev *sd,
> if (cal_rx_pad_is_source(fse->pad)) {
> struct v4l2_mbus_framefmt *fmt;
>
> - fmt = cal_camerarx_get_pad_format(phy, sd_state,
> + fmt = cal_camerarx_get_pad_format(phy, state,
> CAL_CAMERARX_PAD_SINK,
> fse->which);
> if (fse->code != fmt->code) {
> @@ -711,7 +711,7 @@ static int cal_camerarx_sd_enum_frame_size(struct v4l2_subdev *sd,
> }
>
> static int cal_camerarx_sd_get_fmt(struct v4l2_subdev *sd,
> - struct v4l2_subdev_state *sd_state,
> + struct v4l2_subdev_state *state,
> struct v4l2_subdev_format *format)
> {
> struct cal_camerarx *phy = to_cal_camerarx(sd);
> @@ -719,7 +719,7 @@ static int cal_camerarx_sd_get_fmt(struct v4l2_subdev *sd,
>
> mutex_lock(&phy->mutex);
>
> - fmt = cal_camerarx_get_pad_format(phy, sd_state, format->pad,
> + fmt = cal_camerarx_get_pad_format(phy, state, format->pad,
> format->which);
> format->format = *fmt;
>
> @@ -729,7 +729,7 @@ static int cal_camerarx_sd_get_fmt(struct v4l2_subdev *sd,
> }
>
> static int cal_camerarx_sd_set_fmt(struct v4l2_subdev *sd,
> - struct v4l2_subdev_state *sd_state,
> + struct v4l2_subdev_state *state,
> struct v4l2_subdev_format *format)
> {
> struct cal_camerarx *phy = to_cal_camerarx(sd);
> @@ -739,7 +739,7 @@ static int cal_camerarx_sd_set_fmt(struct v4l2_subdev *sd,
>
> /* No transcoding, source and sink formats must match. */
> if (cal_rx_pad_is_source(format->pad))
> - return cal_camerarx_sd_get_fmt(sd, sd_state, format);
> + return cal_camerarx_sd_get_fmt(sd, state, format);
>
> /*
> * Default to the first format if the requested media bus code isn't
> @@ -765,12 +765,12 @@ static int cal_camerarx_sd_set_fmt(struct v4l2_subdev *sd,
>
> mutex_lock(&phy->mutex);
>
> - fmt = cal_camerarx_get_pad_format(phy, sd_state,
> + fmt = cal_camerarx_get_pad_format(phy, state,
> CAL_CAMERARX_PAD_SINK,
> format->which);
> *fmt = format->format;
>
> - fmt = cal_camerarx_get_pad_format(phy, sd_state,
> + fmt = cal_camerarx_get_pad_format(phy, state,
> CAL_CAMERARX_PAD_FIRST_SOURCE,
> format->which);
> *fmt = format->format;
> @@ -781,10 +781,10 @@ static int cal_camerarx_sd_set_fmt(struct v4l2_subdev *sd,
> }
>
> static int cal_camerarx_sd_init_cfg(struct v4l2_subdev *sd,
> - struct v4l2_subdev_state *sd_state)
> + struct v4l2_subdev_state *state)
> {
> struct v4l2_subdev_format format = {
> - .which = sd_state ? V4L2_SUBDEV_FORMAT_TRY
> + .which = state ? V4L2_SUBDEV_FORMAT_TRY
> : V4L2_SUBDEV_FORMAT_ACTIVE,
> .pad = CAL_CAMERARX_PAD_SINK,
> .format = {
> @@ -799,7 +799,7 @@ static int cal_camerarx_sd_init_cfg(struct v4l2_subdev *sd,
> },
> };
>
> - return cal_camerarx_sd_set_fmt(sd, sd_state, &format);
> + return cal_camerarx_sd_set_fmt(sd, state, &format);
> }
>
> static const struct v4l2_subdev_video_ops cal_camerarx_video_ops = {
--
Regards,
Laurent Pinchart
