Re: [PATCH v3 26/29] staging: media: ipu7: Use v4l2_subdev_get_frame_desc()

On Mon, Aug 24, 2026 at 03:14:48PM +0300, Sakari Ailus wrote:
> Call v4l2_subdev_get_frame_desc() to obtain the frame descriptor. This is
> preferred over calling the get_frame_desc() pad operation directly.
>
> Signed-off-by: Sakari Ailus <[email protected]>
> ---

Reviewed-by: Frank Li <[email protected]>

>  .../staging/media/ipu7/ipu7-isys-csi-phy.c    | 19 ++++++--------
>  drivers/staging/media/ipu7/ipu7-isys-csi2.c   | 26 ++++++++-----------
>  2 files changed, 19 insertions(+), 26 deletions(-)
>
> diff --git a/drivers/staging/media/ipu7/ipu7-isys-csi-phy.c b/drivers/staging/media/ipu7/ipu7-isys-csi-phy.c
> index 3f15af3b4c79..70f8a55e3bce 100644
> --- a/drivers/staging/media/ipu7/ipu7-isys-csi-phy.c
> +++ b/drivers/staging/media/ipu7/ipu7-isys-csi-phy.c
> @@ -5,6 +5,7 @@
>
>  #include <linux/bitmap.h>
>  #include <linux/bug.h>
> +#include <linux/cleanup.h>
>  #include <linux/delay.h>
>  #include <linux/device.h>
>  #include <linux/iopoll.h>
> @@ -300,7 +301,6 @@ static int ipu7_isys_csi_ctrl_dids_config(struct ipu7_isys_csi2 *csi2, u32 id)
>  {
>  	struct v4l2_mbus_frame_desc_entry *desc_entry = NULL;
>  	struct device *dev = &csi2->isys->adev->auxdev.dev;
> -	struct v4l2_mbus_frame_desc desc;
>  	struct v4l2_subdev *ext_sd;
>  	struct media_pad *pad;
>  	unsigned int i;
> @@ -318,17 +318,14 @@ static int ipu7_isys_csi_ctrl_dids_config(struct ipu7_isys_csi2 *csi2, u32 id)
>  		 pad->entity->name))
>  		return -ENODEV;
>
> -	ret = v4l2_subdev_call(ext_sd, pad, get_frame_desc, pad->index, &desc);
> -	if (ret)
> -		return ret;
> -
> -	if (desc.type != V4L2_MBUS_FRAME_DESC_TYPE_CSI2) {
> -		dev_warn(dev, "Unsupported frame descriptor type\n");
> -		return -EINVAL;
> -	}
> +	struct v4l2_mbus_frame_desc *desc __free(v4l2_subdev_free_frame_desc) =
> +		v4l2_subdev_get_frame_desc(ext_sd, pad->index,
> +					   V4L2_MBUS_FRAME_DESC_TYPE_CSI2);
> +	if (IS_ERR(desc))
> +		return PTR_ERR(desc);
>
> -	for (i = 0; i < desc.num_entries; i++) {
> -		desc_entry = &desc.entry[i];
> +	for (i = 0; i < desc->num_entries; i++) {
> +		desc_entry = &desc->entry[i];
>  		if (desc_entry->bus.csi2.vc < IPU7_NR_OF_CSI2_VC) {
>  			ret = __dids_config(csi2, id, desc_entry->bus.csi2.vc,
>  					    desc_entry->bus.csi2.dt);
> diff --git a/drivers/staging/media/ipu7/ipu7-isys-csi2.c b/drivers/staging/media/ipu7/ipu7-isys-csi2.c
> index f34eabfe8a98..08f4ca1e0289 100644
> --- a/drivers/staging/media/ipu7/ipu7-isys-csi2.c
> +++ b/drivers/staging/media/ipu7/ipu7-isys-csi2.c
> @@ -6,6 +6,7 @@
>  #include <linux/atomic.h>
>  #include <linux/bits.h>
>  #include <linux/bug.h>
> +#include <linux/cleanup.h>
>  #include <linux/delay.h>
>  #include <linux/device.h>
>  #include <linux/io.h>
> @@ -491,11 +492,9 @@ int ipu7_isys_csi2_get_remote_desc(u32 source_stream,
>  {
>  	struct v4l2_mbus_frame_desc_entry *desc_entry = NULL;
>  	struct device *dev = &csi2->isys->adev->auxdev.dev;
> -	struct v4l2_mbus_frame_desc desc;
>  	struct v4l2_subdev *source;
>  	struct media_pad *pad;
>  	unsigned int i;
> -	int ret;
>
>  	source = media_entity_to_v4l2_subdev(source_entity);
>  	if (!source)
> @@ -505,18 +504,15 @@ int ipu7_isys_csi2_get_remote_desc(u32 source_stream,
>  	if (!pad)
>  		return -EPIPE;
>
> -	ret = v4l2_subdev_call(source, pad, get_frame_desc, pad->index, &desc);
> -	if (ret)
> -		return ret;
> -
> -	if (desc.type != V4L2_MBUS_FRAME_DESC_TYPE_CSI2) {
> -		dev_err(dev, "Unsupported frame descriptor type\n");
> -		return -EINVAL;
> -	}
> +	struct v4l2_mbus_frame_desc *desc __free(v4l2_subdev_free_frame_desc) =
> +		v4l2_subdev_get_frame_desc(source, pad->index,
> +					   V4L2_MBUS_FRAME_DESC_TYPE_CSI2);
> +	if (IS_ERR(desc))
> +		return PTR_ERR(desc);
>
> -	for (i = 0; i < desc.num_entries; i++) {
> -		if (source_stream == desc.entry[i].stream) {
> -			desc_entry = &desc.entry[i];
> +	for (i = 0; i < desc->num_entries; i++) {
> +		if (source_stream == desc->entry[i].stream) {
> +			desc_entry = &desc->entry[i];
>  			break;
>  		}
>  	}
> @@ -534,8 +530,8 @@ int ipu7_isys_csi2_get_remote_desc(u32 source_stream,
>
>  	*entry = *desc_entry;
>
> -	for (i = 0; i < desc.num_entries; i++) {
> -		if (desc_entry->bus.csi2.vc == desc.entry[i].bus.csi2.vc)
> +	for (i = 0; i < desc->num_entries; i++) {
> +		if (desc_entry->bus.csi2.vc == desc->entry[i].bus.csi2.vc)
>  			(*nr_queues)++;
>  	}
>
> --
> 2.47.3
>