[PATCH v3 25/29] media: ipu6: Use v4l2_subdev_get_frame_desc()
Sakari Ailus <[email protected]>
| Newsgroups | org.kernel.vger.linux-media |
|---|---|
| Organization | Intel Finland Oy - BIC 0357606-4 - c/o Alberga Business Park, 6 krs, Bertel Jungin Aukio 5, 02600 Espoo |
| Message-ID | <[email protected]> |
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]> --- drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c | 22 ++++++++----------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c b/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c index 7e539a0c6c92..5317b01935a3 100644 --- a/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c +++ b/drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c @@ -6,6 +6,7 @@ #include <linux/atomic.h> #include <linux/bitfield.h> #include <linux/bits.h> +#include <linux/cleanup.h> #include <linux/delay.h> #include <linux/device.h> #include <linux/err.h> @@ -600,11 +601,9 @@ int ipu6_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) @@ -614,18 +613,15 @@ int ipu6_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; } } -- 2.47.3