tw9910 driver tries to sleep for the smae period of time
after each gpiod_set_value(). The patch moves duplicated code
to a helper function.

Signed-off-by: Alexey Khoroshilov <khoroshi...@ispras.ru>
---
 drivers/media/i2c/tw9910.c | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/drivers/media/i2c/tw9910.c b/drivers/media/i2c/tw9910.c
index 0971f8a34afb..8d1138e13803 100644
--- a/drivers/media/i2c/tw9910.c
+++ b/drivers/media/i2c/tw9910.c
@@ -584,6 +584,14 @@ static int tw9910_s_register(struct v4l2_subdev *sd,
 }
 #endif
 
+static void tw9910_set_gpio_value(struct gpio_desc *desc, int value)
+{
+       if (desc) {
+               gpiod_set_value(desc, value);
+               usleep_range(500, 1000);
+       }
+}
+
 static int tw9910_power_on(struct tw9910_priv *priv)
 {
        struct i2c_client *client = v4l2_get_subdevdata(&priv->subdev);
@@ -595,10 +603,7 @@ static int tw9910_power_on(struct tw9910_priv *priv)
                        return ret;
        }
 
-       if (priv->pdn_gpio) {
-               gpiod_set_value(priv->pdn_gpio, 0);
-               usleep_range(500, 1000);
-       }
+       tw9910_set_gpio_value(priv->pdn_gpio, 0);
 
        /*
         * FIXME: The reset signal is connected to a shared GPIO on some
@@ -611,18 +616,13 @@ static int tw9910_power_on(struct tw9910_priv *priv)
        if (IS_ERR(priv->rstb_gpio)) {
                dev_info(&client->dev, "Unable to get GPIO \"rstb\"");
                clk_disable_unprepare(priv->clk);
-               if (priv->pdn_gpio) {
-                       gpiod_set_value(priv->pdn_gpio, 1);
-                       usleep_range(500, 1000);
-               }
+               tw9910_set_gpio_value(priv->pdn_gpio, 1);
                return PTR_ERR(priv->rstb_gpio);
        }
 
        if (priv->rstb_gpio) {
-               gpiod_set_value(priv->rstb_gpio, 1);
-               usleep_range(500, 1000);
-               gpiod_set_value(priv->rstb_gpio, 0);
-               usleep_range(500, 1000);
+               tw9910_set_gpio_value(priv->rstb_gpio, 1);
+               tw9910_set_gpio_value(priv->rstb_gpio, 0);
 
                gpiod_put(priv->rstb_gpio);
        }
@@ -633,11 +633,7 @@ static int tw9910_power_on(struct tw9910_priv *priv)
 static int tw9910_power_off(struct tw9910_priv *priv)
 {
        clk_disable_unprepare(priv->clk);
-
-       if (priv->pdn_gpio) {
-               gpiod_set_value(priv->pdn_gpio, 1);
-               usleep_range(500, 1000);
-       }
+       tw9910_set_gpio_value(priv->pdn_gpio, 1);
 
        return 0;
 }
-- 
2.7.4

Reply via email to