Commit e5833b56 authored by Marek Vasut's avatar Marek Vasut Committed by Mauro Carvalho Chehab
Browse files

media: stm32: dcmi: Drop always NULL sd_state from dcmi_pipeline_s_fmt() 



The second argument is always NULL, stop passing it to the function.

Signed-off-by: default avatarMarek Vasut <marex@denx.de>
Cc: Alain Volmat <alain.volmat@foss.st.com>
Cc: Alexandre Torgue <alexandre.torgue@foss.st.com>
Cc: Amelie DELAUNAY <amelie.delaunay@foss.st.com>
Cc: Hugues FRUCHET <hugues.fruchet@foss.st.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Philippe CORNU <philippe.cornu@foss.st.com>
Cc: linux-stm32@st-md-mailman.stormreply.com
Cc: linux-arm-kernel@lists.infradead.org
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 90f8cb51

drivers/media/platform/st/stm32/stm32-dcmi.c

+2 −3
Original line number Diff line number Diff line
@@ -622,7 +622,6 @@ static struct media_entity *dcmi_find_source(struct stm32_dcmi *dcmi) 
}



static int dcmi_pipeline_s_fmt(struct stm32_dcmi *dcmi,

			       struct v4l2_subdev_state *sd_state,

			       struct v4l2_subdev_format *format)

{

	struct media_entity *entity = &dcmi->source->entity;
@@ -664,7 +663,7 @@ static int dcmi_pipeline_s_fmt(struct stm32_dcmi *dcmi, 
			format->format.width, format->format.height);



		fmt.pad = pad->index;

		ret = v4l2_subdev_call(subdev, pad, set_fmt, sd_state, &fmt);

		ret = v4l2_subdev_call(subdev, pad, set_fmt, NULL, &fmt);

		if (ret < 0) {

			dev_err(dcmi->dev, "%s: Failed to set format 0x%x %ux%u on \"%s\":%d pad (%d)\n",

				__func__, format->format.code,
@@ -1115,7 +1114,7 @@ static int dcmi_set_fmt(struct stm32_dcmi *dcmi, struct v4l2_format *f) 
	mf->width = sd_framesize.width;

	mf->height = sd_framesize.height;



	ret = dcmi_pipeline_s_fmt(dcmi, NULL, &format);

	ret = dcmi_pipeline_s_fmt(dcmi, &format);

	if (ret < 0)

		return ret;