Re: [PATCH v4 7/9] media: v4l: subdev: Remove stream-unaware sub-device state access

[Laurent Pinchart <laurent.pinchart@ideasonboard.com>]

On Thu, Oct 26, 2023 at 10:03:27AM +0300, Sakari Ailus wrote:
> Remove stream-unaware sub-device state access functions and macros. These
> are no longer used.
> 
> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
> ---
>  include/media/v4l2-subdev.h | 77 -------------------------------------
>  1 file changed, 77 deletions(-)
> 
> diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
> index ebb3373b431a..ae9e0f0c1b19 100644
> --- a/include/media/v4l2-subdev.h
> +++ b/include/media/v4l2-subdev.h
> @@ -1144,83 +1144,6 @@ struct v4l2_subdev_fh {
>  #define to_v4l2_subdev_fh(fh)	\
>  	container_of(fh, struct v4l2_subdev_fh, vfh)
>  
> -#if defined(CONFIG_VIDEO_V4L2_SUBDEV_API)
> -
> -/**
> - * v4l2_subdev_get_pad_format - ancillary routine to call
> - *	&struct v4l2_subdev_pad_config->try_fmt
> - *
> - * @sd: pointer to &struct v4l2_subdev
> - * @state: pointer to &struct v4l2_subdev_state
> - * @pad: index of the pad in the &struct v4l2_subdev_state->pads array
> - */
> -static inline struct v4l2_mbus_framefmt *
> -v4l2_subdev_get_pad_format(struct v4l2_subdev *sd,
> -			   struct v4l2_subdev_state *state,
> -			   unsigned int pad)
> -{
> -	if (WARN_ON(!state))
> -		return NULL;
> -	if (WARN_ON(pad >= sd->entity.num_pads))
> -		pad = 0;
> -	return &state->pads[pad].try_fmt;
> -}
> -
> -/**
> - * v4l2_subdev_get_pad_crop - ancillary routine to call
> - *	&struct v4l2_subdev_pad_config->try_crop
> - *
> - * @sd: pointer to &struct v4l2_subdev
> - * @state: pointer to &struct v4l2_subdev_state.
> - * @pad: index of the pad in the &struct v4l2_subdev_state->pads array.
> - */
> -static inline struct v4l2_rect *
> -v4l2_subdev_get_pad_crop(struct v4l2_subdev *sd,
> -			 struct v4l2_subdev_state *state,
> -			 unsigned int pad)
> -{
> -	if (WARN_ON(!state))
> -		return NULL;
> -	if (WARN_ON(pad >= sd->entity.num_pads))
> -		pad = 0;
> -	return &state->pads[pad].try_crop;
> -}
> -
> -/**
> - * v4l2_subdev_get_pad_compose - ancillary routine to call
> - *	&struct v4l2_subdev_pad_config->try_compose
> - *
> - * @sd: pointer to &struct v4l2_subdev
> - * @state: pointer to &struct v4l2_subdev_state.
> - * @pad: index of the pad in the &struct v4l2_subdev_state->pads array.
> - */
> -static inline struct v4l2_rect *
> -v4l2_subdev_get_pad_compose(struct v4l2_subdev *sd,
> -			    struct v4l2_subdev_state *state,
> -			    unsigned int pad)
> -{
> -	if (WARN_ON(!state))
> -		return NULL;
> -	if (WARN_ON(pad >= sd->entity.num_pads))
> -		pad = 0;
> -	return &state->pads[pad].try_compose;
> -}
> -
> -/*
> - * Temprary helpers until uses of v4l2_subdev_get_try_* functions have been

It's nice to get rid of the typo at the same time ;-)

> - * renamed
> - */
> -#define v4l2_subdev_get_try_format(sd, state, pad) \
> -	v4l2_subdev_get_pad_format(sd, state, pad)
> -
> -#define v4l2_subdev_get_try_crop(sd, state, pad) \
> -	v4l2_subdev_get_pad_crop(sd, state, pad)
> -
> -#define v4l2_subdev_get_try_compose(sd, state, pad) \
> -	v4l2_subdev_get_pad_compose(sd, state, pad)
> -
> -#endif /* CONFIG_VIDEO_V4L2_SUBDEV_API */
> -
>  extern const struct v4l2_file_operations v4l2_subdev_fops;
>  
>  /**

-- 
Regards,

Laurent Pinchart