media: i2c: ov4689: Refactor ov4689_set_ctrl

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@gmail.com>
Reviewed-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/drivers/media/i2c/ov4689.c b/drivers/media/i2c/ov4689.c
index 3c53ae27cd147fb43612f301589bb6f579a24f6d..3c77a235320af757642a5e1cece455cca2c81642 100644 (file)
--- a/drivers/media/i2c/ov4689.c
+++ b/drivers/media/i2c/ov4689.c
@@ -580,10 +580,11 @@ 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 = 0;
        s64 max_expo;
-       int ret;
+       int ret = 0;
 
        /* Propagate change of current control to all related controls */
        switch (ctrl->id) {
@@ -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);
                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);