no the current code is more clean
just move
gi = &gpio_desc[gpio];
chip = gi->chip
after the current check;
On 11:27 Fri 10 May , Alexander Shiyan wrote:
>
> Signed-off-by: Alexander Shiyan <shc_w...@mail.ru>
> ---
> drivers/gpio/gpiolib.c | 181
> ++++++++++++++++++++++++++-----------------------
> 1 file changed, 95 insertions(+), 86 deletions(-)
>
> diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
> index 6398268..1662dcd 100644
> --- a/drivers/gpio/gpiolib.c
> +++ b/drivers/gpio/gpiolib.c
> @@ -34,117 +34,126 @@ static int gpio_ensure_requested(struct gpio_info *gi,
> int gpio)
>
> int gpio_request(unsigned gpio, const char *label)
> {
> - struct gpio_info *gi = &gpio_desc[gpio];
> - struct gpio_chip *chip = gi->chip;
> - int ret;
> -
> - if (!gpio_is_valid(gpio))
> - return -EINVAL;
> - if (!chip)
> - return -EINVAL;
> - if (gi->requested)
> - return -EBUSY;
> - if (chip->ops->request) {
> - ret = chip->ops->request(chip, gpio - chip->base);
> - if (ret)
> - return ret;
> - }
> + if (gpio_is_valid(gpio)) {
> + struct gpio_info *gi = &gpio_desc[gpio];
> + struct gpio_chip *chip = gi->chip;
> + int ret;
> +
> + if (!chip)
> + return -EINVAL;
> + if (gi->requested)
> + return -EBUSY;
> + if (chip->ops->request) {
> + ret = chip->ops->request(chip, gpio - chip->base);
> + if (ret)
> + return ret;
> + }
>
> - gi->requested = true;
> - gi->label = xstrdup(label);
> + gi->requested = true;
> + gi->label = xstrdup(label);
>
> - return 0;
> + return 0;
> + }
> +
> + return -EINVAL;
> }
>
> void gpio_free(unsigned gpio)
> {
> - struct gpio_info *gi = &gpio_desc[gpio];
> - struct gpio_chip *chip = gi->chip;
> -
> - if (!gpio_is_valid(gpio))
> - return;
> - if (!chip)
> - return;
> - if (!gi->requested)
> - return;
> - if (chip->ops->free)
> - chip->ops->free(chip, gpio - chip->base);
> -
> - gi->requested = false;
> - free(gi->label);
> + if (gpio_is_valid(gpio)) {
> + struct gpio_info *gi = &gpio_desc[gpio];
> + struct gpio_chip *chip = gi->chip;
> +
> + if (!chip)
> + return;
> + if (!gi->requested)
> + return;
> + if (chip->ops->free)
> + chip->ops->free(chip, gpio - chip->base);
> +
> + gi->requested = false;
> + free(gi->label);
> + }
> }
>
> void gpio_set_value(unsigned gpio, int value)
> {
> - struct gpio_info *gi = &gpio_desc[gpio];
> - struct gpio_chip *chip = gi->chip;
> -
> - if (!gpio_is_valid(gpio))
> - return;
> - if (!chip)
> - return;
> - if (gpio_ensure_requested(gi, gpio))
> - return;
> - if (!chip->ops->set)
> - return;
> - chip->ops->set(chip, gpio - chip->base, value);
> + if (gpio_is_valid(gpio)) {
> + struct gpio_info *gi = &gpio_desc[gpio];
> + struct gpio_chip *chip = gi->chip;
> +
> + if (!chip)
> + return;
> + if (gpio_ensure_requested(gi, gpio))
> + return;
> + if (!chip->ops->set)
> + return;
> + chip->ops->set(chip, gpio - chip->base, value);
> + }
> }
> EXPORT_SYMBOL(gpio_set_value);
>
> int gpio_get_value(unsigned gpio)
> {
> - struct gpio_info *gi = &gpio_desc[gpio];
> - struct gpio_chip *chip = gi->chip;
> - int ret;
> -
> - if (!gpio_is_valid(gpio))
> - return -EINVAL;
> - if (!chip)
> - return -ENODEV;
> - ret = gpio_ensure_requested(gi, gpio);
> - if (ret)
> - return ret;
> - if (!chip->ops->get)
> - return -ENOSYS;
> - return chip->ops->get(chip, gpio - chip->base);
> + if (gpio_is_valid(gpio)) {
> + struct gpio_info *gi = &gpio_desc[gpio];
> + struct gpio_chip *chip = gi->chip;
> + int ret;
> +
> + if (!chip)
> + return -ENODEV;
> + ret = gpio_ensure_requested(gi, gpio);
> + if (ret)
> + return ret;
> + if (!chip->ops->get)
> + return -ENOSYS;
> + return chip->ops->get(chip, gpio - chip->base);
> + }
> +
> + return -EINVAL;
> }
> EXPORT_SYMBOL(gpio_get_value);
>
> int gpio_direction_output(unsigned gpio, int value)
> {
> - struct gpio_info *gi = &gpio_desc[gpio];
> - struct gpio_chip *chip = gi->chip;
> - int ret;
> -
> - if (!gpio_is_valid(gpio))
> - return -EINVAL;
> - if (!chip)
> - return -ENODEV;
> - ret = gpio_ensure_requested(gi, gpio);
> - if (ret)
> - return ret;
> - if (!chip->ops->direction_output)
> - return -ENOSYS;
> - return chip->ops->direction_output(chip, gpio - chip->base, value);
> + if (gpio_is_valid(gpio)) {
> + struct gpio_info *gi = &gpio_desc[gpio];
> + struct gpio_chip *chip = gi->chip;
> + int ret;
> +
> + if (!chip)
> + return -ENODEV;
> + ret = gpio_ensure_requested(gi, gpio);
> + if (ret)
> + return ret;
> + if (!chip->ops->direction_output)
> + return -ENOSYS;
> + return chip->ops->direction_output(chip, gpio - chip->base,
> + value);
> + }
> +
> + return -EINVAL;
> }
> EXPORT_SYMBOL(gpio_direction_output);
>
> int gpio_direction_input(unsigned gpio)
> {
> - struct gpio_info *gi = &gpio_desc[gpio];
> - struct gpio_chip *chip = gi->chip;
> - int ret;
> -
> - if (!gpio_is_valid(gpio))
> - return -EINVAL;
> - if (!chip)
> - return -ENODEV;
> - ret = gpio_ensure_requested(gi, gpio);
> - if (ret)
> - return ret;
> - if (!chip->ops->direction_input)
> - return -ENOSYS;
> - return chip->ops->direction_input(chip, gpio - chip->base);
> + if (gpio_is_valid(gpio)) {
> + struct gpio_info *gi = &gpio_desc[gpio];
> + struct gpio_chip *chip = gi->chip;
> + int ret;
> +
> + if (!chip)
> + return -ENODEV;
> + ret = gpio_ensure_requested(gi, gpio);
> + if (ret)
> + return ret;
> + if (!chip->ops->direction_input)
> + return -ENOSYS;
> + return chip->ops->direction_input(chip, gpio - chip->base);
> + }
> +
> + return -EINVAL;
> }
> EXPORT_SYMBOL(gpio_direction_input);
>
> --
> 1.8.1.5
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
