media: ov8865: move mode_configure out of state_configure

ov8865_mode_configure() only needs to be called on sensor init, but it can
be called multiple times from ov8865_state_configure(). Move
ov8865_mode_configure() to ov8865_sensor_init().

Signed-off-by: Allen Ballway <ballway@chromium.org>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org>

diff --git a/drivers/media/i2c/ov8865.c b/drivers/media/i2c/ov8865.c
index 06582ce9258884d7b01d5c53e725d04e3ff53f46..a8586df14f77749184381f686f6b007879fb76ad 100644 (file)
--- a/drivers/media/i2c/ov8865.c
+++ b/drivers/media/i2c/ov8865.c
@@ -2304,14 +2304,6 @@ static int ov8865_state_configure(struct ov8865_sensor *sensor,
        if (sensor->state.streaming)
                return -EBUSY;
 
-       /* State will be configured at first power on otherwise. */
-       if (pm_runtime_enabled(sensor->dev) &&
-           !pm_runtime_suspended(sensor->dev)) {
-               ret = ov8865_mode_configure(sensor, mode, mbus_code);
-               if (ret)
-                       return ret;
-       }
-
        ret = ov8865_state_mipi_configure(sensor, mode, mbus_code);
        if (ret)
                return ret;
@@ -2384,10 +2376,10 @@ static int ov8865_sensor_init(struct ov8865_sensor *sensor)
        }
 
        /* Configure current mode. */
-       ret = ov8865_state_configure(sensor, sensor->state.mode,
-                                    sensor->state.mbus_code);
+       ret = ov8865_mode_configure(sensor, sensor->state.mode,
+                                   sensor->state.mbus_code);
        if (ret) {
-               dev_err(sensor->dev, "failed to configure state\n");
+               dev_err(sensor->dev, "failed to configure mode\n");
                return ret;
        }