Merge branch 'for-4.10/block' of git://git.kernel.dk/linux-block

[linux-2.6-block.git] / drivers / gpio / gpio-axp209.c

diff --git a/drivers/gpio/gpio-axp209.c b/drivers/gpio/gpio-axp209.c
index d9c2a517c6df75f0b26f8be0d8706b67ef7c62aa..4a346b7b4172ad70898ecfd3c49f3f7f086d87e6 100644 (file)
--- a/drivers/gpio/gpio-axp209.c
+++ b/drivers/gpio/gpio-axp209.c
@@ -64,13 +64,9 @@ static int axp20x_gpio_get(struct gpio_chip *chip, unsigned offset)
 {
        struct axp20x_gpio *gpio = gpiochip_get_data(chip);
        unsigned int val;
-       int reg, ret;
-
-       reg = axp20x_gpio_get_reg(offset);
-       if (reg < 0)
-               return reg;
+       int ret;
 
-       ret = regmap_read(gpio->regmap, reg, &val);
+       ret = regmap_read(gpio->regmap, AXP20X_GPIO20_SS, &val);
        if (ret)
                return ret;