mail archive of the barebox mailing list
 help / color / mirror / Atom feed
* [PATCH 1/2] GPIO: Check for "gpio_is_valid" first
@ 2013-05-10  7:27 Alexander Shiyan
  2013-05-10  7:27 ` [PATCH 2/2] GPIO: Remove unneeded "gpio_is_valid" calls Alexander Shiyan
                   ` (2 more replies)
  0 siblings, 3 replies; 5+ messages in thread
From: Alexander Shiyan @ 2013-05-10  7:27 UTC (permalink / raw)
  To: barebox


Signed-off-by: Alexander Shiyan <shc_work@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

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [PATCH 2/2] GPIO: Remove unneeded "gpio_is_valid" calls
  2013-05-10  7:27 [PATCH 1/2] GPIO: Check for "gpio_is_valid" first Alexander Shiyan
@ 2013-05-10  7:27 ` Alexander Shiyan
  2013-05-10 12:37 ` [PATCH 1/2] GPIO: Check for "gpio_is_valid" first Jean-Christophe PLAGNIOL-VILLARD
  2013-05-10 12:41 ` Jean-Christophe PLAGNIOL-VILLARD
  2 siblings, 0 replies; 5+ messages in thread
From: Alexander Shiyan @ 2013-05-10  7:27 UTC (permalink / raw)
  To: barebox


Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
 drivers/mci/atmel_mci.c      | 3 +--
 drivers/w1/masters/w1-gpio.c | 6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/mci/atmel_mci.c b/drivers/mci/atmel_mci.c
index c5fd306..9570d36 100644
--- a/drivers/mci/atmel_mci.c
+++ b/drivers/mci/atmel_mci.c
@@ -608,8 +608,7 @@ static int atmci_probe(struct device_d *hw_dev)
 	return 0;
 
 err_gpio_cd_request:
-	if (gpio_is_valid(pd->detect_pin))
-		gpio_free(pd->detect_pin);
+	gpio_free(pd->detect_pin);
 
 	return ret;
 }
diff --git a/drivers/w1/masters/w1-gpio.c b/drivers/w1/masters/w1-gpio.c
index 946e9d3..6e017c6 100644
--- a/drivers/w1/masters/w1-gpio.c
+++ b/drivers/w1/masters/w1-gpio.c
@@ -88,14 +88,12 @@ static int __init w1_gpio_probe(struct device_d *dev)
 	if (pdata->enable_external_pullup)
 		pdata->enable_external_pullup(1);
 
-	if (gpio_is_valid(pdata->ext_pullup_enable_pin))
-		gpio_set_value(pdata->ext_pullup_enable_pin, 1);
+	gpio_set_value(pdata->ext_pullup_enable_pin, 1);
 
 	return 0;
 
  free_gpio_ext_pu:
-	if (gpio_is_valid(pdata->ext_pullup_enable_pin))
-		gpio_free(pdata->ext_pullup_enable_pin);
+	gpio_free(pdata->ext_pullup_enable_pin);
  free_gpio:
 	gpio_free(pdata->pin);
  free_master:
-- 
1.8.1.5


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] GPIO: Check for "gpio_is_valid" first
  2013-05-10  7:27 [PATCH 1/2] GPIO: Check for "gpio_is_valid" first Alexander Shiyan
  2013-05-10  7:27 ` [PATCH 2/2] GPIO: Remove unneeded "gpio_is_valid" calls Alexander Shiyan
@ 2013-05-10 12:37 ` Jean-Christophe PLAGNIOL-VILLARD
  2013-05-10 12:41 ` Jean-Christophe PLAGNIOL-VILLARD
  2 siblings, 0 replies; 5+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2013-05-10 12:37 UTC (permalink / raw)
  To: Alexander Shiyan; +Cc: barebox

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_work@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

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] GPIO: Check for "gpio_is_valid" first
  2013-05-10  7:27 [PATCH 1/2] GPIO: Check for "gpio_is_valid" first Alexander Shiyan
  2013-05-10  7:27 ` [PATCH 2/2] GPIO: Remove unneeded "gpio_is_valid" calls Alexander Shiyan
  2013-05-10 12:37 ` [PATCH 1/2] GPIO: Check for "gpio_is_valid" first Jean-Christophe PLAGNIOL-VILLARD
@ 2013-05-10 12:41 ` Jean-Christophe PLAGNIOL-VILLARD
  2013-05-10 13:20   ` Re[2]: " Alexander Shiyan
  2 siblings, 1 reply; 5+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2013-05-10 12:41 UTC (permalink / raw)
  To: Alexander Shiyan; +Cc: barebox

HI,

	do as in linux

	introduce

	static struct gpio_desc *gpio_to_desc(unsigned gpio)

	and we need to check the gpio is valid before calling _free/ser/get
	etc..

On 11:27 Fri 10 May     , Alexander Shiyan wrote:
> 
> Signed-off-by: Alexander Shiyan <shc_work@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

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re[2]: [PATCH 1/2] GPIO: Check for "gpio_is_valid" first
  2013-05-10 12:41 ` Jean-Christophe PLAGNIOL-VILLARD
@ 2013-05-10 13:20   ` Alexander Shiyan
  0 siblings, 0 replies; 5+ messages in thread
From: Alexander Shiyan @ 2013-05-10 13:20 UTC (permalink / raw)
  To: Jean-Christophe PLAGNIOL-VILLARD; +Cc: barebox

> HI,
> 
> 	do as in linux
> 
> 	introduce
> 
> 	static struct gpio_desc *gpio_to_desc(unsigned gpio)
> 
> 	and we need to check the gpio is valid before calling _free/ser/get
> 	etc..

Indeed.

> > Signed-off-by: Alexander Shiyan <shc_work@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);

---
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2013-05-10 13:20 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-05-10  7:27 [PATCH 1/2] GPIO: Check for "gpio_is_valid" first Alexander Shiyan
2013-05-10  7:27 ` [PATCH 2/2] GPIO: Remove unneeded "gpio_is_valid" calls Alexander Shiyan
2013-05-10 12:37 ` [PATCH 1/2] GPIO: Check for "gpio_is_valid" first Jean-Christophe PLAGNIOL-VILLARD
2013-05-10 12:41 ` Jean-Christophe PLAGNIOL-VILLARD
2013-05-10 13:20   ` Re[2]: " Alexander Shiyan

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox