Commit 7caa6570 authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

media: atomisp: Simplify atomisp_subdev_set_selection() calls in atomisp_set_fmt() 

With the atomisp_subdev_set_selection(sink-pad, V4L2_SEL_TGT_CROP, rect)
calls dropped. The first and last compount code blocks of the 3 code blocks
in the if (...) {} else if (...) {} else {} code setting the source-pad
V4L2_SEL_TGT_COMPOSE selection are the same.

The both set V4L2_SEL_TGT_COMPOSE to a rectangle with the same dimensions
as f->fmt.pix.height.

Remove the else {} block at the end, drop the second if and prepend
the first if condition with "!second-if-condition ||" to remove
the code duplication.

Link: https://lore.kernel.org/r/20230529103741.11904-10-hdegoede@redhat.com



Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent af330c96

drivers/staging/media/atomisp/pci/atomisp_cmd.c

+3 −13
Original line number Diff line number Diff line
@@ -4319,7 +4319,8 @@ int atomisp_set_fmt(struct video_device *vdev, struct v4l2_format *f) 


	/* Try to enable YUV downscaling if ISP input is 10 % (either

	 * width or height) bigger than the desired result. */

	if (isp_sink_crop.width * 9 / 10 < f->fmt.pix.width ||

	if (!IS_MOFD ||

	    isp_sink_crop.width * 9 / 10 < f->fmt.pix.width ||

	    isp_sink_crop.height * 9 / 10 < f->fmt.pix.height ||

	    (atomisp_subdev_format_conversion(asd) &&

	     (asd->run_mode->val == ATOMISP_RUN_MODE_VIDEO ||
@@ -4331,7 +4332,7 @@ int atomisp_set_fmt(struct video_device *vdev, struct v4l2_format *f) 
					     V4L2_SUBDEV_FORMAT_ACTIVE,

					     ATOMISP_SUBDEV_PAD_SOURCE, V4L2_SEL_TGT_COMPOSE,

					     0, &isp_sink_crop);

	} else if (IS_MOFD) {

	} else {

		struct v4l2_rect main_compose = {0};



		main_compose.width = isp_sink_crop.width;
@@ -4346,17 +4347,6 @@ int atomisp_set_fmt(struct video_device *vdev, struct v4l2_format *f) 
					 f->fmt.pix.height);

		}



		atomisp_subdev_set_selection(&asd->subdev, fh.state,

					     V4L2_SUBDEV_FORMAT_ACTIVE,

					     ATOMISP_SUBDEV_PAD_SOURCE,

					     V4L2_SEL_TGT_COMPOSE, 0,

					     &main_compose);

	} else {

		struct v4l2_rect main_compose = {0};



		main_compose.width = f->fmt.pix.width;

		main_compose.height = f->fmt.pix.height;



		atomisp_subdev_set_selection(&asd->subdev, fh.state,

					     V4L2_SUBDEV_FORMAT_ACTIVE,

					     ATOMISP_SUBDEV_PAD_SOURCE,