Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

media: imx-pxp: Drop unneeded v4l2_m2m_get_vq() NULL check

The v4l2_m2m_get_vq() function never returns NULL.

In the set format handler, the check may have been intended to catch
invalid format types, but that's not needed as the V4L2 core picks the
appropriate VIDIOC_S_FMT ioctl handler based on the format type, so the
type can't be incorrect.

In the get format handler, the return value is not used for any purpose
other than the NULL check, which was therefore probably intended to
catch invalid format types. That's not needed for the same reason as in
the set format handler.

Drop the unneeded return value checks and, as the function has no side
effect, the unneeded function call as well.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Frank Li <Frank.Li@nxp.com>
Reviewed-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>

authored by

Laurent Pinchart and committed by
Hans Verkuil
4417205a 21910e35

-7
-7
drivers/media/platform/nxp/imx-pxp.c
··· 1180 1180 1181 1181 static int pxp_g_fmt(struct pxp_ctx *ctx, struct v4l2_format *f) 1182 1182 { 1183 - struct vb2_queue *vq; 1184 1183 struct pxp_q_data *q_data; 1185 - 1186 - vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, f->type); 1187 - if (!vq) 1188 - return -EINVAL; 1189 1184 1190 1185 q_data = get_q_data(ctx, f->type); 1191 1186 ··· 1324 1329 struct vb2_queue *vq; 1325 1330 1326 1331 vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, f->type); 1327 - if (!vq) 1328 - return -EINVAL; 1329 1332 1330 1333 q_data = get_q_data(ctx, f->type); 1331 1334 if (!q_data)