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 | |
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')
-rw-r--r-- | include/asm-generic/gpio.h | 10 | ||||
-rw-r--r-- | include/linux/gpio.h | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h index 6098cae2af8e..ff5c66080c8c 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 |
diff --git a/include/linux/gpio.h b/include/linux/gpio.h index f79d67f413e4..4b47ed96f131 100644 --- a/include/linux/gpio.h +++ b/include/linux/gpio.h | |||
@@ -30,7 +30,7 @@ static inline int gpio_is_valid(int number) | |||
30 | return 0; | 30 | return 0; |
31 | } | 31 | } |
32 | 32 | ||
33 | static inline int __must_check gpio_request(unsigned gpio, const char *label) | 33 | static inline int gpio_request(unsigned gpio, const char *label) |
34 | { | 34 | { |
35 | return -ENOSYS; | 35 | return -ENOSYS; |
36 | } | 36 | } |
@@ -62,12 +62,12 @@ static inline void gpio_free_array(struct gpio *array, size_t num) | |||
62 | WARN_ON(1); | 62 | WARN_ON(1); |
63 | } | 63 | } |
64 | 64 | ||
65 | static inline int __must_check gpio_direction_input(unsigned gpio) | 65 | static inline int gpio_direction_input(unsigned gpio) |
66 | { | 66 | { |
67 | return -ENOSYS; | 67 | return -ENOSYS; |
68 | } | 68 | } |
69 | 69 | ||
70 | static inline int __must_check gpio_direction_output(unsigned gpio, int value) | 70 | static inline int gpio_direction_output(unsigned gpio, int value) |
71 | { | 71 | { |
72 | return -ENOSYS; | 72 | return -ENOSYS; |
73 | } | 73 | } |