Commit decd50c1 authored by Qianfeng Rong's avatar Qianfeng Rong Committed by Linus Walleij
Browse files

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: default avatarQianfeng Rong <rongqianfeng@vivo.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 050e711a

drivers/pinctrl/mvebu/pinctrl-armada-37xx.c

+4 −2
Original line number Diff line number Diff line
@@ -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);