[U-Boot] [PATCH 1/4] gpio: xilinx: Find out bank before use in xilinx_gpio_get_function()

Stefan Herbrechtsmeier stefan at herbrechtsmeier.net
Mon Jul 30 13:28:44 UTC 2018


Am 30.07.2018 um 14:34 schrieb Michal Simek:
> Call xilinx_gpio_get_bank_pin() before use.
>
> Reported-by: Stefan Herbrechtsmeier <stefan at herbrechtsmeier.net>
> Signed-off-by: Michal Simek <michal.simek at xilinx.com>
> ---
>
>   drivers/gpio/xilinx_gpio.c | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpio/xilinx_gpio.c b/drivers/gpio/xilinx_gpio.c
> index 48b52c985a55..8ce08d80f491 100644
> --- a/drivers/gpio/xilinx_gpio.c
> +++ b/drivers/gpio/xilinx_gpio.c
> @@ -435,6 +435,10 @@ static int xilinx_gpio_get_function(struct udevice *dev, unsigned offset)
>   	int val, ret;
>   	u32 bank, pin;
>   
> +	ret = xilinx_gpio_get_bank_pin(offset, &bank, &pin, dev);
> +	if (ret)
> +		return ret;
> +
>   	/* Check if all pins are inputs */
>   	if (platdata->bank_input[bank])
>   		return GPIOF_INPUT;
> @@ -443,10 +447,6 @@ static int xilinx_gpio_get_function(struct udevice *dev, unsigned offset)
>   	if (platdata->bank_output[bank])
>   		return GPIOF_OUTPUT;
>   
> -	ret = xilinx_gpio_get_bank_pin(offset, &bank, &pin, dev);
> -	if (ret)
> -		return ret;
> -
>   	/* FIXME test on dual */
>   	val = readl(&platdata->regs->gpiodir + bank * 2);
>   	val = !(val & (1 << pin));

Reviewed-by: Stefan Herbrechtsmeier <stefan at herbrechtsmeier.net>



More information about the U-Boot mailing list