Hi Mikhail,
On Mon, Dec 18, 2023 at 08:40:27PM +0300, Mikhail Rudenko wrote:
> Introduce local variable for regmap within the ov4689_set_ctrl
> function. This adjustment eliminates repetition within the function.
>
> Signed-off-by: Mikhail Rudenko <mike.rudenko@xxxxxxxxx>
> ---
> drivers/media/i2c/ov4689.c | 11 +++++------
> 1 file changed, 5 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/media/i2c/ov4689.c b/drivers/media/i2c/ov4689.c
> index 3b20eba59c9c..d42f5d1a1ba8 100644
> --- a/drivers/media/i2c/ov4689.c
> +++ b/drivers/media/i2c/ov4689.c
> @@ -580,6 +580,7 @@ static int ov4689_set_ctrl(struct v4l2_ctrl *ctrl)
> {
> struct ov4689 *ov4689 =
> container_of(ctrl->handler, struct ov4689, ctrl_handler);
> + struct regmap *regmap = ov4689->regmap;
> struct device *dev = ov4689->dev;
> int sensor_gain;
> s64 max_expo;
> @@ -603,16 +604,15 @@ static int ov4689_set_ctrl(struct v4l2_ctrl *ctrl)
> switch (ctrl->id) {
> case V4L2_CID_EXPOSURE:
> /* 4 least significant bits of exposure are fractional part */
> - ret = cci_write(ov4689->regmap, OV4689_REG_EXPOSURE,
> - ctrl->val << 4, NULL);
> + cci_write(regmap, OV4689_REG_EXPOSURE, ctrl->val << 4, &ret);
If you do this, ret needs to have been initialised to 0, but it isn't.
Same for the changes below.
> break;
> case V4L2_CID_ANALOGUE_GAIN:
> ret = ov4689_map_gain(ov4689, ctrl->val, &sensor_gain);
> - cci_write(ov4689->regmap, OV4689_REG_GAIN, sensor_gain, &ret);
> + cci_write(regmap, OV4689_REG_GAIN, sensor_gain, &ret);
> break;
> case V4L2_CID_VBLANK:
> - ret = cci_write(ov4689->regmap, OV4689_REG_VTS,
> - ctrl->val + ov4689->cur_mode->height, NULL);
> + cci_write(regmap, OV4689_REG_VTS,
> + ctrl->val + ov4689->cur_mode->height, &ret);
> break;
> case V4L2_CID_TEST_PATTERN:
> ret = ov4689_enable_test_pattern(ov4689, ctrl->val);
> @@ -625,7 +625,6 @@ static int ov4689_set_ctrl(struct v4l2_ctrl *ctrl)
> }
>
> pm_runtime_put(dev);
> -
I thought it was nice.
> return ret;
> }
>
--
Regards,
Sakari Ailus
