pinctrl: armada-37xx: Use int type to store negative error codes

In armada_37xx_gpio_direction_output(), the 'ret' variable might store
the negative error codes returned by regmap_update_bits(), and in
armada_37xx_edge_both_irq_swap_pol(), the 'ret' variable directly
stores -1, so the type of the 'ret' variable needs to be changed to
int in both cases.

No effect on runtime.

Signed-off-by: Qianfeng Rong <rongqianfeng@vivo.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
index 881df5e08f61767e64338afab3a24ad91399e2d1..81dfbd5e7f07116d0496208fbe2c2a649132cf8a 100644 (file)
--- a/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
+++ b/drivers/pinctrl/mvebu/pinctrl-armada-37xx.c
@@ -420,7 +420,8 @@ static int armada_37xx_gpio_direction_output(struct gpio_chip *chip,
        struct armada_37xx_pinctrl *info = gpiochip_get_data(chip);
        unsigned int en_offset = offset;
        unsigned int reg = OUTPUT_VAL;
-       unsigned int mask, val, ret;
+       unsigned int mask, val;
+       int ret;
 
        armada_37xx_update_reg(&reg, &offset);
        mask = BIT(offset);
@@ -634,8 +635,9 @@ static int armada_37xx_edge_both_irq_swap_pol(struct armada_37xx_pinctrl *info,
 {
        u32 reg_idx = pin_idx / GPIO_PER_REG;
        u32 bit_num = pin_idx % GPIO_PER_REG;
-       u32 p, l, ret;
        unsigned long flags;
+       u32 p, l;
+       int ret;
 
        regmap_read(info->regmap, INPUT_VAL + 4*reg_idx, &l);