Commit 1e153520 authored by Deepak R Varma's avatar Deepak R Varma Committed by Mauro Carvalho Chehab
Browse files

media: staging: media: atomisp: code formatting changes atomisp_csi2.c 



Several trivial code reformatting changes done according to the coding
style guidelines. These changes improves code organisation and readability
and also 4 address many chackpatch error, warning and check complaints.

Signed-off-by: default avatarDeepak R Varma <drv@mailo.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent de27891f

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

+34 −36
Original line number Diff line number Diff line
@@ -22,13 +22,11 @@ 
#include "atomisp_internal.h"

#include "atomisp-regs.h"



static struct v4l2_mbus_framefmt *__csi2_get_format(struct

	atomisp_mipi_csi2_device

	* csi2,

static struct

v4l2_mbus_framefmt *__csi2_get_format(struct atomisp_mipi_csi2_device *csi2,

				      struct v4l2_subdev_state *sd_state,

	enum

	v4l2_subdev_format_whence

	which, unsigned int pad)

				      enum v4l2_subdev_format_whence which,

				      unsigned int pad)

{

	if (which == V4L2_SUBDEV_FORMAT_TRY)

		return v4l2_subdev_get_try_format(&csi2->subdev, sd_state,
@@ -104,11 +102,11 @@ int atomisp_csi2_set_ffmt(struct v4l2_subdev *sd, 
		else

			actual_ffmt->code = atomisp_in_fmt_conv[0].code;



		actual_ffmt->width = clamp_t(

					 u32, ffmt->width, ATOM_ISP_MIN_WIDTH,

		actual_ffmt->width = clamp_t(u32, ffmt->width,

					     ATOM_ISP_MIN_WIDTH,

					     ATOM_ISP_MAX_WIDTH);

		actual_ffmt->height = clamp_t(

					  u32, ffmt->height, ATOM_ISP_MIN_HEIGHT,

		actual_ffmt->height = clamp_t(u32, ffmt->height,

					      ATOM_ISP_MIN_HEIGHT,

					      ATOM_ISP_MAX_HEIGHT);



		tmp_ffmt = *ffmt = *actual_ffmt;
@@ -249,9 +247,8 @@ static int mipi_csi2_init_entities(struct atomisp_mipi_csi2_device *csi2, 
	if (ret < 0)

		return ret;



	csi2->formats[CSI2_PAD_SINK].code =

	    csi2->formats[CSI2_PAD_SOURCE].code =

		atomisp_in_fmt_conv[0].code;

	csi2->formats[CSI2_PAD_SINK].code = atomisp_in_fmt_conv[0].code;

	csi2->formats[CSI2_PAD_SOURCE].code = atomisp_in_fmt_conv[0].code;



	return 0;

}
@@ -379,14 +376,15 @@ static void atomisp_csi2_configure_isp2401(struct atomisp_sub_device *asd) 
	    (isp->inputs[asd->input_curr].camera->ctrl_handler, &ctrl) == 0)

		mipi_freq = ctrl.value;



	clk_termen = atomisp_csi2_configure_calc(coeff_clk_termen,

		     mipi_freq, TERMEN_DEFAULT);

	clk_settle = atomisp_csi2_configure_calc(coeff_clk_settle,

		     mipi_freq, SETTLE_DEFAULT);

	dat_termen = atomisp_csi2_configure_calc(coeff_dat_termen,

		     mipi_freq, TERMEN_DEFAULT);

	dat_settle = atomisp_csi2_configure_calc(coeff_dat_settle,

		     mipi_freq, SETTLE_DEFAULT);

	clk_termen = atomisp_csi2_configure_calc(coeff_clk_termen, mipi_freq,

						 TERMEN_DEFAULT);

	clk_settle = atomisp_csi2_configure_calc(coeff_clk_settle, mipi_freq,

						 SETTLE_DEFAULT);

	dat_termen = atomisp_csi2_configure_calc(coeff_dat_termen, mipi_freq,

						 TERMEN_DEFAULT);

	dat_settle = atomisp_csi2_configure_calc(coeff_dat_settle, mipi_freq,

						 SETTLE_DEFAULT);



	for (n = 0; n < csi2_port_lanes[port] + 1; n++) {

		hrt_address base = csi2_port_base[port] + csi2_lane_base[n];