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

media: atomisp: Drop ffmt local var from atomisp_set_fmt() 



ffmt is a local variable pointing to a substruct of another local
variable which really just makes the code harder to read / follow,
so drop it.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent f05cf254

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

+5 −6
Original line number Diff line number Diff line
@@ -4992,7 +4992,6 @@ int atomisp_set_fmt(struct video_device *vdev, struct v4l2_format *f) 
	struct v4l2_subdev_format vformat = {

		.which = V4L2_SUBDEV_FORMAT_ACTIVE,

	};

	struct v4l2_mbus_framefmt *ffmt = &vformat.format;

	struct v4l2_rect isp_sink_crop;

	u16 source_pad = atomisp_subdev_source_pad(vdev);

	struct v4l2_subdev_fh fh;
@@ -5031,17 +5030,17 @@ int atomisp_set_fmt(struct video_device *vdev, struct v4l2_format *f) 
	/* Ensure that the resolution is equal or below the maximum supported */



	vformat.which = V4L2_SUBDEV_FORMAT_ACTIVE;

	v4l2_fill_mbus_format(ffmt, &f->fmt.pix, format_bridge->mbus_code);

	ffmt->height += padding_h;

	ffmt->width += padding_w;

	v4l2_fill_mbus_format(&vformat.format, &f->fmt.pix, format_bridge->mbus_code);

	vformat.format.height += padding_h;

	vformat.format.width += padding_w;



	ret = v4l2_subdev_call(isp->inputs[asd->input_curr].camera, pad,

			       set_fmt, NULL, &vformat);

	if (ret)

		return ret;



	f->fmt.pix.width = ffmt->width - padding_w;

	f->fmt.pix.height = ffmt->height - padding_h;

	f->fmt.pix.width = vformat.format.width - padding_w;

	f->fmt.pix.height = vformat.format.height - padding_h;



	snr_fmt = f->fmt.pix;

	backup_fmt = snr_fmt;