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.

Reviewed-by: Linus Walleij <linus.wall...@linaro.org>
Signed-off-by: Bartosz Golaszewski <bartosz.golaszew...@linaro.org>
---
 arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c 
b/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c
index 4d8fa9ed1a678..6e37dfc6c5c9e 100644
--- a/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c
+++ b/arch/powerpc/platforms/83xx/mcu_mpc8349emitx.c
@@ -92,10 +92,11 @@ static void mcu_power_off(void)
        mutex_unlock(&mcu->lock);
 }
 
-static void mcu_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
+static int mcu_gpio_set(struct gpio_chip *gc, unsigned int gpio, int val)
 {
        struct mcu *mcu = gpiochip_get_data(gc);
        u8 bit = 1 << (4 + gpio);
+       int ret;
 
        mutex_lock(&mcu->lock);
        if (val)
@@ -103,14 +104,16 @@ static void mcu_gpio_set(struct gpio_chip *gc, unsigned 
int gpio, int val)
        else
                mcu->reg_ctrl |= bit;
 
-       i2c_smbus_write_byte_data(mcu->client, MCU_REG_CTRL, mcu->reg_ctrl);
+       ret = i2c_smbus_write_byte_data(mcu->client, MCU_REG_CTRL,
+                                       mcu->reg_ctrl);
        mutex_unlock(&mcu->lock);
+
+       return ret;
 }
 
 static int mcu_gpio_dir_out(struct gpio_chip *gc, unsigned int gpio, int val)
 {
-       mcu_gpio_set(gc, gpio, val);
-       return 0;
+       return mcu_gpio_set(gc, gpio, val);
 }
 
 static int mcu_gpiochip_add(struct mcu *mcu)
@@ -123,7 +126,7 @@ static int mcu_gpiochip_add(struct mcu *mcu)
        gc->can_sleep = 1;
        gc->ngpio = MCU_NUM_GPIO;
        gc->base = -1;
-       gc->set = mcu_gpio_set;
+       gc->set_rv = mcu_gpio_set;
        gc->direction_output = mcu_gpio_dir_out;
        gc->parent = dev;
 

-- 
2.45.2


Reply via email to