Commit 4c999ae3 authored by Deepak R Varma's avatar Deepak R Varma Committed by Mauro Carvalho Chehab

media: staging: media: atomisp: fix CamelCase variable naming

Mixed case variable names are discouraged and they result in checkpatch
script "Avoid CamelCase" warnings. Replace such CamelCase variable names
by lower case strings according to the coding style guidelines.
Signed-off-by: default avatarDeepak R Varma <drv@mailo.com>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Acked-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent f50559f0
......@@ -1000,10 +1000,10 @@ static long mt9m114_s_exposure(struct v4l2_subdev *sd,
struct mt9m114_device *dev = to_mt9m114_sensor(sd);
int ret = 0;
unsigned int coarse_integration = 0;
unsigned int FLines = 0;
unsigned int FrameLengthLines = 0; /* ExposureTime.FrameLengthLines; */
unsigned int AnalogGain, DigitalGain;
u32 AnalogGainToWrite = 0;
unsigned int f_lines = 0;
unsigned int frame_len_lines = 0; /* ExposureTime.FrameLengthLines; */
unsigned int analog_gain, digital_gain;
u32 analog_gain_to_write = 0;
dev_dbg(&client->dev, "%s(0x%X 0x%X 0x%X)\n", __func__,
exposure->integration_time[0], exposure->gain[0],
......@@ -1012,28 +1012,28 @@ static long mt9m114_s_exposure(struct v4l2_subdev *sd,
coarse_integration = exposure->integration_time[0];
/*
* fine_integration = ExposureTime.FineIntegrationTime;
* FrameLengthLines = ExposureTime.FrameLengthLines;
* frame_len_lines = ExposureTime.FrameLengthLines;
*/
FLines = mt9m114_res[dev->res].lines_per_frame;
AnalogGain = exposure->gain[0];
DigitalGain = exposure->gain[1];
f_lines = mt9m114_res[dev->res].lines_per_frame;
analog_gain = exposure->gain[0];
digital_gain = exposure->gain[1];
if (!dev->streamon) {
/*Save the first exposure values while stream is off*/
dev->first_exp = coarse_integration;
dev->first_gain = AnalogGain;
dev->first_diggain = DigitalGain;
dev->first_gain = analog_gain;
dev->first_diggain = digital_gain;
}
/* DigitalGain = 0x400 * (((u16) DigitalGain) >> 8) + */
/* ((unsigned int)(0x400 * (((u16) DigitalGain) & 0xFF)) >>8); */
/* digital_gain = 0x400 * (((u16) digital_gain) >> 8) + */
/* ((unsigned int)(0x400 * (((u16) digital_gain) & 0xFF)) >>8); */
/* set frame length */
if (FLines < coarse_integration + 6)
FLines = coarse_integration + 6;
if (FLines < FrameLengthLines)
FLines = FrameLengthLines;
ret = mt9m114_write_reg(client, MISENSOR_16BIT, 0x300A, FLines);
if (f_lines < coarse_integration + 6)
f_lines = coarse_integration + 6;
if (f_lines < frame_len_lines)
f_lines = frame_len_lines;
ret = mt9m114_write_reg(client, MISENSOR_16BIT, 0x300A, f_lines);
if (ret) {
v4l2_err(client, "%s: fail to set FLines\n", __func__);
v4l2_err(client, "%s: fail to set f_lines\n", __func__);
return -EINVAL;
}
......@@ -1051,38 +1051,39 @@ static long mt9m114_s_exposure(struct v4l2_subdev *sd,
/*
* set analog/digital gain
switch(AnalogGain)
switch(analog_gain)
{
case 0:
AnalogGainToWrite = 0x0;
analog_gain_to_write = 0x0;
break;
case 1:
AnalogGainToWrite = 0x20;
analog_gain_to_write = 0x20;
break;
case 2:
AnalogGainToWrite = 0x60;
analog_gain_to_write = 0x60;
break;
case 4:
AnalogGainToWrite = 0xA0;
analog_gain_to_write = 0xA0;
break;
case 8:
AnalogGainToWrite = 0xE0;
analog_gain_to_write = 0xE0;
break;
default:
AnalogGainToWrite = 0x20;
analog_gain_to_write = 0x20;
break;
}
*/
if (DigitalGain >= 16 || DigitalGain <= 1)
DigitalGain = 1;
if (digital_gain >= 16 || digital_gain <= 1)
digital_gain = 1;
/*
* AnalogGainToWrite = (u16)((DigitalGain << 12) | AnalogGainToWrite);
* analog_gain_to_write = (u16)((digital_gain << 12)
* | analog_gain_to_write);
*/
AnalogGainToWrite = (u16)((DigitalGain << 12) | (u16)AnalogGain);
analog_gain_to_write = (u16)((digital_gain << 12) | (u16)analog_gain);
ret = mt9m114_write_reg(client, MISENSOR_16BIT,
REG_GAIN, AnalogGainToWrite);
REG_GAIN, analog_gain_to_write);
if (ret) {
v4l2_err(client, "%s: fail to set AnalogGainToWrite\n",
v4l2_err(client, "%s: fail to set analog_gain_to_write\n",
__func__);
return -EINVAL;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment