| Message ID | 20240216223237.326523-3-hdegoede@redhat.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | media: ov2680: Add all controls required by libcamera | expand |
Quoting Hans de Goede (2024-02-16 22:32:34) > The hts, vts ov2680_mode struct members always contain > OV2680_PIXELS_PER_LINE resp. OV2680_LINES_PER_FRAME, > drop them and simply use these values directly. > Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com> > Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > drivers/media/i2c/ov2680.c | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > > diff --git a/drivers/media/i2c/ov2680.c b/drivers/media/i2c/ov2680.c > index 5b04c6c0554a..b4d5936dcd02 100644 > --- a/drivers/media/i2c/ov2680.c > +++ b/drivers/media/i2c/ov2680.c > @@ -140,8 +140,6 @@ struct ov2680_mode { > u16 v_end; > u16 h_output_size; > u16 v_output_size; > - u16 hts; > - u16 vts; > }; > > struct ov2680_dev { > @@ -361,8 +359,6 @@ static void ov2680_calc_mode(struct ov2680_dev *sensor) > min(sensor->mode.v_start + height - 1, OV2680_NATIVE_HEIGHT - 1); > sensor->mode.h_output_size = orig_width; > sensor->mode.v_output_size = orig_height; > - sensor->mode.hts = OV2680_PIXELS_PER_LINE; > - sensor->mode.vts = OV2680_LINES_PER_FRAME; > } > > static int ov2680_set_mode(struct ov2680_dev *sensor) > @@ -397,9 +393,9 @@ static int ov2680_set_mode(struct ov2680_dev *sensor) > cci_write(sensor->regmap, OV2680_REG_VERTICAL_OUTPUT_SIZE, > sensor->mode.v_output_size, &ret); > cci_write(sensor->regmap, OV2680_REG_TIMING_HTS, > - sensor->mode.hts, &ret); > + OV2680_PIXELS_PER_LINE, &ret); > cci_write(sensor->regmap, OV2680_REG_TIMING_VTS, > - sensor->mode.vts, &ret); > + OV2680_LINES_PER_FRAME, &ret); > cci_write(sensor->regmap, OV2680_REG_ISP_X_WIN, 0, &ret); > cci_write(sensor->regmap, OV2680_REG_ISP_Y_WIN, 0, &ret); > cci_write(sensor->regmap, OV2680_REG_X_INC, inc, &ret); > -- > 2.43.0 >
diff --git a/drivers/media/i2c/ov2680.c b/drivers/media/i2c/ov2680.c index 5b04c6c0554a..b4d5936dcd02 100644 --- a/drivers/media/i2c/ov2680.c +++ b/drivers/media/i2c/ov2680.c @@ -140,8 +140,6 @@ struct ov2680_mode { u16 v_end; u16 h_output_size; u16 v_output_size; - u16 hts; - u16 vts; }; struct ov2680_dev { @@ -361,8 +359,6 @@ static void ov2680_calc_mode(struct ov2680_dev *sensor) min(sensor->mode.v_start + height - 1, OV2680_NATIVE_HEIGHT - 1); sensor->mode.h_output_size = orig_width; sensor->mode.v_output_size = orig_height; - sensor->mode.hts = OV2680_PIXELS_PER_LINE; - sensor->mode.vts = OV2680_LINES_PER_FRAME; } static int ov2680_set_mode(struct ov2680_dev *sensor) @@ -397,9 +393,9 @@ static int ov2680_set_mode(struct ov2680_dev *sensor) cci_write(sensor->regmap, OV2680_REG_VERTICAL_OUTPUT_SIZE, sensor->mode.v_output_size, &ret); cci_write(sensor->regmap, OV2680_REG_TIMING_HTS, - sensor->mode.hts, &ret); + OV2680_PIXELS_PER_LINE, &ret); cci_write(sensor->regmap, OV2680_REG_TIMING_VTS, - sensor->mode.vts, &ret); + OV2680_LINES_PER_FRAME, &ret); cci_write(sensor->regmap, OV2680_REG_ISP_X_WIN, 0, &ret); cci_write(sensor->regmap, OV2680_REG_ISP_Y_WIN, 0, &ret); cci_write(sensor->regmap, OV2680_REG_X_INC, inc, &ret);
The hts, vts ov2680_mode struct members always contain OV2680_PIXELS_PER_LINE resp. OV2680_LINES_PER_FRAME, drop them and simply use these values directly. Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- drivers/media/i2c/ov2680.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)