media: ov2680: Fix ov2680_bayer_order()

The index into ov2680_hv_flip_bayer_order[] should be 0-3, but
ov2680_bayer_order() was using 0 + BIT(2) + (BIT(2) << 1) as
max index, while the intention was to use: 0 + 1 + 2 as max index.

Fix the index calculation in ov2680_bayer_order(), while at it
also just use the ctrl values rather then reading them back using
a slow i2c-read transaction.

This also allows making the function void, since there now are
no more i2c-reads to error check.

Note the check for the ctrls being NULL is there to allow
adding an ov2680_fill_format() helper later, which will call
ov2680_set_bayer_order() during probe() before the ctrls are created.

[Sakari Ailus: Change all users of ov2680_set_bayer_order() here]

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 3a737a1607a42de0421af68ec247e026a73e76de..f05fbba72c7c2e8cca230a9075427eef2763ba2f 100644 (file)
--- a/drivers/media/i2c/ov2680.c
+++ b/drivers/media/i2c/ov2680.c
@@ -315,26 +315,17 @@ static void ov2680_power_down(struct ov2680_dev *sensor)
        usleep_range(5000, 10000);
 }
 
-static int ov2680_bayer_order(struct ov2680_dev *sensor)
+static void ov2680_set_bayer_order(struct ov2680_dev *sensor)
 {
-       u32 format1;
-       u32 format2;
-       u32 hv_flip;
-       int ret;
-
-       ret = ov2680_read_reg(sensor, OV2680_REG_FORMAT1, &format1);
-       if (ret < 0)
-               return ret;
+       int hv_flip = 0;
 
-       ret = ov2680_read_reg(sensor, OV2680_REG_FORMAT2, &format2);
-       if (ret < 0)
-               return ret;
+       if (sensor->ctrls.vflip && sensor->ctrls.vflip->val)
+               hv_flip += 1;
 
-       hv_flip = (format2 & BIT(2)  << 1) | (format1 & BIT(2));
+       if (sensor->ctrls.hflip && sensor->ctrls.hflip->val)
+               hv_flip += 2;
 
        sensor->fmt.code = ov2680_hv_flip_bayer_order[hv_flip];
-
-       return 0;
 }
 
 static int ov2680_vflip_enable(struct ov2680_dev *sensor)
@@ -345,7 +336,8 @@ static int ov2680_vflip_enable(struct ov2680_dev *sensor)
        if (ret < 0)
                return ret;
 
-       return ov2680_bayer_order(sensor);
+       ov2680_set_bayer_order(sensor);
+       return 0;
 }
 
 static int ov2680_vflip_disable(struct ov2680_dev *sensor)
@@ -356,7 +348,8 @@ static int ov2680_vflip_disable(struct ov2680_dev *sensor)
        if (ret < 0)
                return ret;
 
-       return ov2680_bayer_order(sensor);
+       ov2680_set_bayer_order(sensor);
+       return 0;
 }
 
 static int ov2680_hflip_enable(struct ov2680_dev *sensor)
@@ -367,7 +360,8 @@ static int ov2680_hflip_enable(struct ov2680_dev *sensor)
        if (ret < 0)
                return ret;
 
-       return ov2680_bayer_order(sensor);
+       ov2680_set_bayer_order(sensor);
+       return 0;
 }
 
 static int ov2680_hflip_disable(struct ov2680_dev *sensor)
@@ -378,7 +372,8 @@ static int ov2680_hflip_disable(struct ov2680_dev *sensor)
        if (ret < 0)
                return ret;
 
-       return ov2680_bayer_order(sensor);
+       ov2680_set_bayer_order(sensor);
+       return 0;
 }
 
 static int ov2680_test_pattern_set(struct ov2680_dev *sensor, int value)