media: ov2680: Fix vflip / hflip set functions

ov2680_vflip_disable() / ov2680_hflip_disable() pass BIT(0) instead of
0 as value to ov2680_mod_reg().

While fixing this also:

1. Stop having separate enable/disable functions for hflip / vflip
2. Move the is_streaming check, which is unique to hflip / vflip
   into the ov2680_set_?flip() functions.

for a nice code cleanup.

Fixes: 3ee47cad3e69 ("media: ov2680: Add Omnivision OV2680 sensor driver")
Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com>
Acked-by: Rui Miguel Silva <rmfrfs@gmail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.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/ov2680.c b/drivers/media/i2c/ov2680.c
index f05fbba72c7c2e8cca230a9075427eef2763ba2f..74024ba968b4d74c85da8db5ee5bc1e43afe6190 100644 (file)
--- a/drivers/media/i2c/ov2680.c
+++ b/drivers/media/i2c/ov2680.c
@@ -328,23 +328,15 @@ static void ov2680_set_bayer_order(struct ov2680_dev *sensor)
        sensor->fmt.code = ov2680_hv_flip_bayer_order[hv_flip];
 }
 
-static int ov2680_vflip_enable(struct ov2680_dev *sensor)
+static int ov2680_set_vflip(struct ov2680_dev *sensor, s32 val)
 {
        int ret;
 
-       ret = ov2680_mod_reg(sensor, OV2680_REG_FORMAT1, BIT(2), BIT(2));
-       if (ret < 0)
-               return ret;
-
-       ov2680_set_bayer_order(sensor);
-       return 0;
-}
-
-static int ov2680_vflip_disable(struct ov2680_dev *sensor)
-{
-       int ret;
+       if (sensor->is_streaming)
+               return -EBUSY;
 
-       ret = ov2680_mod_reg(sensor, OV2680_REG_FORMAT1, BIT(2), BIT(0));
+       ret = ov2680_mod_reg(sensor, OV2680_REG_FORMAT1,
+                            BIT(2), val ? BIT(2) : 0);
        if (ret < 0)
                return ret;
 
@@ -352,23 +344,15 @@ static int ov2680_vflip_disable(struct ov2680_dev *sensor)
        return 0;
 }
 
-static int ov2680_hflip_enable(struct ov2680_dev *sensor)
+static int ov2680_set_hflip(struct ov2680_dev *sensor, s32 val)
 {
        int ret;
 
-       ret = ov2680_mod_reg(sensor, OV2680_REG_FORMAT2, BIT(2), BIT(2));
-       if (ret < 0)
-               return ret;
-
-       ov2680_set_bayer_order(sensor);
-       return 0;
-}
-
-static int ov2680_hflip_disable(struct ov2680_dev *sensor)
-{
-       int ret;
+       if (sensor->is_streaming)
+               return -EBUSY;
 
-       ret = ov2680_mod_reg(sensor, OV2680_REG_FORMAT2, BIT(2), BIT(0));
+       ret = ov2680_mod_reg(sensor, OV2680_REG_FORMAT2,
+                            BIT(2), val ? BIT(2) : 0);
        if (ret < 0)
                return ret;
 
@@ -722,19 +706,9 @@ static int ov2680_s_ctrl(struct v4l2_ctrl *ctrl)
        case V4L2_CID_EXPOSURE:
                return ov2680_exposure_set(sensor, ctrl->val);
        case V4L2_CID_VFLIP:
-               if (sensor->is_streaming)
-                       return -EBUSY;
-               if (ctrl->val)
-                       return ov2680_vflip_enable(sensor);
-               else
-                       return ov2680_vflip_disable(sensor);
+               return ov2680_set_vflip(sensor, ctrl->val);
        case V4L2_CID_HFLIP:
-               if (sensor->is_streaming)
-                       return -EBUSY;
-               if (ctrl->val)
-                       return ov2680_hflip_enable(sensor);
-               else
-                       return ov2680_hflip_disable(sensor);
+               return ov2680_set_hflip(sensor, ctrl->val);
        case V4L2_CID_TEST_PATTERN:
                return ov2680_test_pattern_set(sensor, ctrl->val);
        default: