Commit 4d7463cd authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

media: imx: utils: Constify some mbus and ipu_image arguments 



The imx_media_mbus_fmt_to_pix_fmt() and imx_media_mbus_fmt_to_ipu_image()
functions do not need to modify their mbus argument, and
imx_media_ipu_image_to_mbus_fmt() does not need to modify its ipu_image
argument. Make them const.

[slongerbeam@gmail.com: Constified mbus arg to
 imx_media_mbus_fmt_to_ipu_image(), and ipu_image
 arg to imx_media_ipu_image_to_mbus_fmt(), as well]

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarSteve Longerbeam <slongerbeam@gmail.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent eef98882

drivers/staging/media/imx/imx-media-utils.c

+3 −3
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ void imx_media_try_colorimetry(struct v4l2_mbus_framefmt *tryfmt, 
EXPORT_SYMBOL_GPL(imx_media_try_colorimetry);



int imx_media_mbus_fmt_to_pix_fmt(struct v4l2_pix_format *pix,

				  struct v4l2_mbus_framefmt *mbus,

				  const struct v4l2_mbus_framefmt *mbus,

				  const struct imx_media_pixfmt *cc)

{

	u32 width;
@@ -550,7 +550,7 @@ int imx_media_mbus_fmt_to_pix_fmt(struct v4l2_pix_format *pix, 
EXPORT_SYMBOL_GPL(imx_media_mbus_fmt_to_pix_fmt);



int imx_media_mbus_fmt_to_ipu_image(struct ipu_image *image,

				    struct v4l2_mbus_framefmt *mbus)

				    const struct v4l2_mbus_framefmt *mbus)

{

	int ret;
@@ -568,7 +568,7 @@ int imx_media_mbus_fmt_to_ipu_image(struct ipu_image *image, 
EXPORT_SYMBOL_GPL(imx_media_mbus_fmt_to_ipu_image);



int imx_media_ipu_image_to_mbus_fmt(struct v4l2_mbus_framefmt *mbus,

				    struct ipu_image *image)

				    const struct ipu_image *image)

{

	const struct imx_media_pixfmt *fmt;

drivers/staging/media/imx/imx-media.h

+3 −3
Original line number Diff line number Diff line
@@ -194,12 +194,12 @@ int imx_media_init_cfg(struct v4l2_subdev *sd, 
void imx_media_try_colorimetry(struct v4l2_mbus_framefmt *tryfmt,

			       bool ic_route);

int imx_media_mbus_fmt_to_pix_fmt(struct v4l2_pix_format *pix,

				  struct v4l2_mbus_framefmt *mbus,

				  const struct v4l2_mbus_framefmt *mbus,

				  const struct imx_media_pixfmt *cc);

int imx_media_mbus_fmt_to_ipu_image(struct ipu_image *image,

				    struct v4l2_mbus_framefmt *mbus);

				    const struct v4l2_mbus_framefmt *mbus);

int imx_media_ipu_image_to_mbus_fmt(struct v4l2_mbus_framefmt *mbus,

				    struct ipu_image *image);

				    const struct ipu_image *image);

void imx_media_grp_id_to_sd_name(char *sd_name, int sz,

				 u32 grp_id, int ipu_id);

struct v4l2_subdev *