hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

media: ov5640: Change horizontal and vertical resolutions name 

The current width and height parameters in the struct ov5640_mode_info are
actually the active horizontal and vertical resolutions.

Since we're going to add a few other parameters, let's pick a better, more
precise name for these values.

Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Maxime Ripard 2018-04-16 08:36:54 -04:00 committed by Mauro Carvalho Chehab
parent 8f57c2f86b
commit dba13a0b08
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/media/i2c/ov5640.c
View File

@ -168,8 +168,8 @@ struct reg_value {
struct ov5640_mode_info { struct ov5640_mode_info {
enum ov5640_mode_id id; enum ov5640_mode_id id;
enum ov5640_downsize_mode dn_mode; enum ov5640_downsize_mode dn_mode;
u32 width; u32 hact;
u32 height; u32 vact;
const struct reg_value *reg_data; const struct reg_value *reg_data;
u32 reg_data_size; u32 reg_data_size;
}; };
@ -1394,10 +1394,10 @@ ov5640_find_mode(struct ov5640_dev *sensor, enum ov5640_frame_rate fr,
if (!mode->reg_data) if (!mode->reg_data)
continue; continue;
if ((nearest && mode->width <= width && if ((nearest && mode->hact <= width &&
mode->height <= height) || mode->vact <= height) ||
(!nearest && mode->width == width && (!nearest && mode->hact == width &&
mode->height == height)) mode->vact == height))
break; break;
} }
@ -1886,8 +1886,8 @@ static int ov5640_try_fmt_internal(struct v4l2_subdev *sd,
mode = ov5640_find_mode(sensor, fr, fmt->width, fmt->height, true); mode = ov5640_find_mode(sensor, fr, fmt->width, fmt->height, true);
if (!mode) if (!mode)
return -EINVAL; return -EINVAL;
fmt->width = mode->width; fmt->width = mode->hact;
fmt->height = mode->height; fmt->height = mode->vact;
if (new_mode) if (new_mode)
*new_mode = mode; *new_mode = mode;
@ -2354,10 +2354,10 @@ static int ov5640_enum_frame_size(struct v4l2_subdev *sd,
return -EINVAL; return -EINVAL;
fse->min_width = fse->min_width =
ov5640_mode_data[0][fse->index].width; ov5640_mode_data[0][fse->index].hact;
fse->max_width = fse->min_width; fse->max_width = fse->min_width;
fse->min_height = fse->min_height =
ov5640_mode_data[0][fse->index].height; ov5640_mode_data[0][fse->index].vact;
fse->max_height = fse->min_height; fse->max_height = fse->min_height;
return 0; return 0;
@ -2421,14 +2421,14 @@ static int ov5640_s_frame_interval(struct v4l2_subdev *sd,
mode = sensor->current_mode; mode = sensor->current_mode;
frame_rate = ov5640_try_frame_interval(sensor, &fi->interval, frame_rate = ov5640_try_frame_interval(sensor, &fi->interval,
mode->width, mode->height); mode->hact, mode->vact);
if (frame_rate < 0) if (frame_rate < 0)
frame_rate = OV5640_15_FPS; frame_rate = OV5640_15_FPS;
sensor->current_fr = frame_rate; sensor->current_fr = frame_rate;
sensor->frame_interval = fi->interval; sensor->frame_interval = fi->interval;
sensor->current_mode = ov5640_find_mode(sensor, frame_rate, mode->width, sensor->current_mode = ov5640_find_mode(sensor, frame_rate, mode->hact,
mode->height, true); mode->vact, true);
sensor->pending_mode_change = true; sensor->pending_mode_change = true;
out: out:
mutex_unlock(&sensor->lock); mutex_unlock(&sensor->lock);