From: Bartosz Golaszewski <bartosz.golaszew...@linaro.org>

struct gpio_chip now has callbacks for setting line values that return
an integer, allowing to indicate failures. Convert the driver to using
them.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszew...@linaro.org>
---
 drivers/gpio/gpio-twl6040.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/gpio/gpio-twl6040.c b/drivers/gpio/gpio-twl6040.c
index 
b9171bf66168f054e9eddef8417bef6d8f197f3c..b9c0d54d12f43242444f12a2bd8b6988d1511466
 100644
--- a/drivers/gpio/gpio-twl6040.c
+++ b/drivers/gpio/gpio-twl6040.c
@@ -44,7 +44,8 @@ static int twl6040gpo_direction_out(struct gpio_chip *chip, 
unsigned offset,
        return 0;
 }
 
-static void twl6040gpo_set(struct gpio_chip *chip, unsigned offset, int value)
+static int twl6040gpo_set(struct gpio_chip *chip, unsigned int offset,
+                         int value)
 {
        struct twl6040 *twl6040 = gpiochip_get_data(chip);
        int ret;
@@ -52,14 +53,14 @@ static void twl6040gpo_set(struct gpio_chip *chip, unsigned 
offset, int value)
 
        ret = twl6040_reg_read(twl6040, TWL6040_REG_GPOCTL);
        if (ret < 0)
-               return;
+               return ret;
 
        if (value)
                gpoctl = ret | BIT(offset);
        else
                gpoctl = ret & ~BIT(offset);
 
-       twl6040_reg_write(twl6040, TWL6040_REG_GPOCTL, gpoctl);
+       return twl6040_reg_write(twl6040, TWL6040_REG_GPOCTL, gpoctl);
 }
 
 static struct gpio_chip twl6040gpo_chip = {
@@ -68,7 +69,7 @@ static struct gpio_chip twl6040gpo_chip = {
        .get                    = twl6040gpo_get,
        .direction_output       = twl6040gpo_direction_out,
        .get_direction          = twl6040gpo_get_direction,
-       .set                    = twl6040gpo_set,
+       .set_rv                 = twl6040gpo_set,
        .can_sleep              = true,
 };
 

-- 
2.48.1


Reply via email to