diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 20:26:46 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 20:26:46 -0500 |
| commit | d8a3515e2a9523f8ed56d1f4537d16338bda2bc2 (patch) | |
| tree | d51bd1b4f0b3c13bedde97ba79e014882be634a9 /include/asm-generic | |
| parent | 6254b32b5791e47ba1c679d023f26985fa34755a (diff) | |
Revert "gpiolib: annotate gpio-intialization with __must_check"
This reverts commit 0fdae42d361bbb431ca0ab0efed5126a94821177, which
wasn't really supposed to go in, and causes lots of annoying warnings.
Quoth Andrew:
"Complete brainfart - I meant to drop that patch ages ago."
Quoth Greg:
"Ick, yeah, that patch isn't ok to go in as-is, all of the callers
need to be fixed up first, which is what I thought we had agreed on..."
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Acked-by: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Greg KH <greg@kroah.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-generic')
| -rw-r--r-- | include/asm-generic/gpio.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h index 6098cae2af8..ff5c66080c8 100644 --- a/include/asm-generic/gpio.h +++ b/include/asm-generic/gpio.h | |||
| @@ -147,11 +147,11 @@ extern struct gpio_chip *gpiochip_find(void *data, | |||
| 147 | /* Always use the library code for GPIO management calls, | 147 | /* Always use the library code for GPIO management calls, |
| 148 | * or when sleeping may be involved. | 148 | * or when sleeping may be involved. |
| 149 | */ | 149 | */ |
| 150 | extern int __must_check gpio_request(unsigned gpio, const char *label); | 150 | extern int gpio_request(unsigned gpio, const char *label); |
| 151 | extern void gpio_free(unsigned gpio); | 151 | extern void gpio_free(unsigned gpio); |
| 152 | 152 | ||
| 153 | extern int __must_check gpio_direction_input(unsigned gpio); | 153 | extern int gpio_direction_input(unsigned gpio); |
| 154 | extern int __must_check gpio_direction_output(unsigned gpio, int value); | 154 | extern int gpio_direction_output(unsigned gpio, int value); |
| 155 | 155 | ||
| 156 | extern int gpio_set_debounce(unsigned gpio, unsigned debounce); | 156 | extern int gpio_set_debounce(unsigned gpio, unsigned debounce); |
| 157 | 157 | ||
| @@ -192,8 +192,8 @@ struct gpio { | |||
| 192 | const char *label; | 192 | const char *label; |
| 193 | }; | 193 | }; |
| 194 | 194 | ||
| 195 | extern int __must_check gpio_request_one(unsigned gpio, unsigned long flags, const char *label); | 195 | extern int gpio_request_one(unsigned gpio, unsigned long flags, const char *label); |
| 196 | extern int __must_check gpio_request_array(struct gpio *array, size_t num); | 196 | extern int gpio_request_array(struct gpio *array, size_t num); |
| 197 | extern void gpio_free_array(struct gpio *array, size_t num); | 197 | extern void gpio_free_array(struct gpio *array, size_t num); |
| 198 | 198 | ||
| 199 | #ifdef CONFIG_GPIO_SYSFS | 199 | #ifdef CONFIG_GPIO_SYSFS |
