summaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2023-01-27 02:21:57 +0100
committerMauro Carvalho Chehab <mchehab@kernel.org>2023-02-08 09:06:07 +0100
commit49a82584b87c385b267f4ca12674f08bd229ab57 (patch)
treed1fc413899b09ac80c08c49dfedd1302bfca3ef6 /drivers/media
parent8ccfc15380e95e0219c42bc4bb3498d2bdb2cfb6 (diff)
downloadlinux-stable-49a82584b87c385b267f4ca12674f08bd229ab57.tar.gz
linux-stable-49a82584b87c385b267f4ca12674f08bd229ab57.tar.bz2
linux-stable-49a82584b87c385b267f4ca12674f08bd229ab57.zip
media: imx: imx7-media-csi: Drop unneeded pad checks
The subdev core guarantees that the .set_fmt() operation is always called with a valid pad. Drop the unneeded pad checks. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Tested-by: Adam Ford <aford173@gmail.com> #imx8mm-beacon-kit Acked-by: Rui Miguel Silva <rmfrfs@gmail.com> Tested-by: Martin Kepplinger <martin.kepplinger@puri.sm> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/nxp/imx7-media-csi.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/media/platform/nxp/imx7-media-csi.c b/drivers/media/platform/nxp/imx7-media-csi.c
index 62232cd6775f..1adf5c3392d9 100644
--- a/drivers/media/platform/nxp/imx7-media-csi.c
+++ b/drivers/media/platform/nxp/imx7-media-csi.c
@@ -1936,6 +1936,7 @@ static int imx7_csi_try_fmt(struct imx7_csi *csi,
sdformat->format.quantization = in_fmt->quantization;
sdformat->format.ycbcr_enc = in_fmt->ycbcr_enc;
break;
+
case IMX7_CSI_PAD_SINK:
*cc = imx7_csi_find_mbus_format(sdformat->format.code);
if (!*cc) {
@@ -1947,8 +1948,6 @@ static int imx7_csi_try_fmt(struct imx7_csi *csi,
if (sdformat->format.field != V4L2_FIELD_INTERLACED)
sdformat->format.field = V4L2_FIELD_NONE;
break;
- default:
- return -EINVAL;
}
imx7_csi_try_colorimetry(&sdformat->format);
@@ -1968,9 +1967,6 @@ static int imx7_csi_set_fmt(struct v4l2_subdev *sd,
struct v4l2_subdev_format format;
int ret = 0;
- if (sdformat->pad >= IMX7_CSI_PADS_NUM)
- return -EINVAL;
-
mutex_lock(&csi->lock);
if (csi->is_streaming) {