Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5e95db4c authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

media: staging: atomisp: do some coding style improvements 



Use make coccicheck in patch mode to do some coding style
improvements. Adjust the results manually.

Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 5c6c9c48

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

+7 −7
Original line number Diff line number Diff line
@@ -515,7 +515,7 @@ irqreturn_t atomisp_isr(int irq, void *dev) 


	spin_lock_irqsave(&isp->lock, flags);

	if (isp->sw_contex.power_state != ATOM_ISP_POWER_UP ||

	    isp->css_initialized == false) {

	    !isp->css_initialized) {

		spin_unlock_irqrestore(&isp->lock, flags);

		return IRQ_HANDLED;

	}
@@ -4603,7 +4603,7 @@ int atomisp_fixed_pattern(struct atomisp_sub_device *asd, int flag, 
	}



	if (*value == 0) {

		asd->params.fpn_en = 0;

		asd->params.fpn_en = false;

		return 0;

	}
@@ -5524,7 +5524,7 @@ static void atomisp_get_dis_envelop(struct atomisp_sub_device *asd, 


	/* if subdev type is SOC camera,we do not need to set DVS */

	if (isp->inputs[asd->input_curr].type == SOC_CAMERA)

		asd->params.video_dis_en = 0;

		asd->params.video_dis_en = false;



	if (asd->params.video_dis_en &&

	    asd->run_mode->val == ATOMISP_RUN_MODE_VIDEO) {
@@ -5624,7 +5624,7 @@ static int atomisp_set_fmt_to_snr(struct video_device *vdev, 
			ffmt = req_ffmt;

			dev_warn(isp->dev,

			  "can not enable video dis due to sensor limitation.");

			asd->params.video_dis_en = 0;

			asd->params.video_dis_en = false;

		}

	}

	dev_dbg(isp->dev, "sensor width: %d, height: %d\n",
@@ -5649,7 +5649,7 @@ static int atomisp_set_fmt_to_snr(struct video_device *vdev, 
	    (ffmt->width < req_ffmt->width || ffmt->height < req_ffmt->height)) {

		dev_warn(isp->dev,

			 "can not enable video dis due to sensor limitation.");

		asd->params.video_dis_en = 0;

		asd->params.video_dis_en = false;

	}



	atomisp_subdev_set_ffmt(&asd->subdev, fh.pad,
@@ -6152,7 +6152,7 @@ int atomisp_set_shading_table(struct atomisp_sub_device *asd, 


	if (!user_shading_table->enable) {

		atomisp_css_set_shading_table(asd, NULL);

		asd->params.sc_en = 0;

		asd->params.sc_en = false;

		return 0;

	}
@@ -6190,7 +6190,7 @@ int atomisp_set_shading_table(struct atomisp_sub_device *asd, 
	free_table = asd->params.css_param.shading_table;

	asd->params.css_param.shading_table = shading_table;

	atomisp_css_set_shading_table(asd, shading_table);

	asd->params.sc_en = 1;

	asd->params.sc_en = true;



out:

	if (free_table != NULL)

drivers/staging/media/atomisp/pci/atomisp2/atomisp_fops.c

+7 −7
Original line number Diff line number Diff line
@@ -689,7 +689,7 @@ static void atomisp_dev_init_struct(struct atomisp_device *isp) 
{

	unsigned int i;



	isp->sw_contex.file_input = 0;

	isp->sw_contex.file_input = false;

	isp->need_gfx_throttle = true;

	isp->isp_fatal_error = false;

	isp->mipi_frame_size = 0;
@@ -708,12 +708,12 @@ static void atomisp_subdev_init_struct(struct atomisp_sub_device *asd) 
	v4l2_ctrl_s_ctrl(asd->run_mode, ATOMISP_RUN_MODE_STILL_CAPTURE);

	memset(&asd->params.css_param, 0, sizeof(asd->params.css_param));

	asd->params.color_effect = V4L2_COLORFX_NONE;

	asd->params.bad_pixel_en = 1;

	asd->params.gdc_cac_en = 0;

	asd->params.video_dis_en = 0;

	asd->params.sc_en = 0;

	asd->params.fpn_en = 0;

	asd->params.xnr_en = 0;

	asd->params.bad_pixel_en = true;

	asd->params.gdc_cac_en = false;

	asd->params.video_dis_en = false;

	asd->params.sc_en = false;

	asd->params.fpn_en = false;

	asd->params.xnr_en = false;

	asd->params.false_color = 0;

	asd->params.online_process = 1;

	asd->params.yuv_ds_en = 0;

drivers/staging/media/atomisp/pci/atomisp2/atomisp_ioctl.c

+1 −1
Original line number Diff line number Diff line
@@ -2731,7 +2731,7 @@ static int atomisp_s_parm_file(struct file *file, void *fh, 
	}



	rt_mutex_lock(&isp->mutex);

	isp->sw_contex.file_input = 1;

	isp->sw_contex.file_input = true;

	rt_mutex_unlock(&isp->mutex);



	return 0;

drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/bufq/src/bufq.c

+1 −1
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ static void map_buffer_type_to_queue_id( 
	}



	for (i = SH_CSS_QUEUE_C_ID; i < SH_CSS_MAX_NUM_QUEUES; i++) {

		if (queue_availability[thread_id][i] == true) {

		if (queue_availability[thread_id][i]) {

			queue_availability[thread_id][i] = false;

			buffer_type_to_queue_id_map[thread_id][buf_type] = i;

			break;

drivers/staging/media/atomisp/pci/atomisp2/css2400/runtime/isys/src/isys_init.c

+1 −3
Original line number Diff line number Diff line
@@ -105,8 +105,6 @@ input_system_error_t ia_css_isys_init(void) 
#elif defined(USE_INPUT_SYSTEM_VERSION_2401)

input_system_error_t ia_css_isys_init(void)

{

	input_system_error_t error = INPUT_SYSTEM_ERR_NO_ERROR;



	ia_css_isys_csi_rx_lut_rmgr_init();

	ia_css_isys_ibuf_rmgr_init();

	ia_css_isys_dma_channel_rmgr_init();
@@ -120,7 +118,7 @@ input_system_error_t ia_css_isys_init(void) 
	isys_irqc_status_enable(ISYS_IRQ1_ID);

	isys_irqc_status_enable(ISYS_IRQ2_ID);



	return error;

	return INPUT_SYSTEM_ERR_NO_ERROR;

}

#endif