Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d8a3515e2a9523f8ed56d1f4537d16338bda2bc2

Authored by Linus Torvalds
1 parent 6254b32b57
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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>

Showing 3 changed files with 9 additions and 9 deletions Side-by-side Diff

Documentation/gpio.txt
Diff comments   View file @ d8a3515
... ... @@ -135,7 +135,7 @@
135 135 int gpio_direction_input(unsigned gpio);
136 136 int gpio_direction_output(unsigned gpio, int value);
137 137  
138   -The return value is zero for success, else a negative errno. It must
  138 +The return value is zero for success, else a negative errno. It should
139 139 be checked, since the get/set calls don't have error returns and since
140 140 misconfiguration is possible. You should normally issue these calls from
141 141 a task context. However, for spinlock-safe GPIOs it's OK to use them
include/asm-generic/gpio.h
Diff comments   View file @ d8a3515
... ... @@ -147,11 +147,11 @@
147 147 /* Always use the library code for GPIO management calls,
148 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 151 extern void gpio_free(unsigned gpio);
152 152  
153   -extern int __must_check gpio_direction_input(unsigned gpio);
154   -extern int __must_check gpio_direction_output(unsigned gpio, int value);
  153 +extern int gpio_direction_input(unsigned gpio);
  154 +extern int gpio_direction_output(unsigned gpio, int value);
155 155  
156 156 extern int gpio_set_debounce(unsigned gpio, unsigned debounce);
157 157  
... ... @@ -192,8 +192,8 @@
192 192 const char *label;
193 193 };
194 194  
195   -extern int __must_check 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);
  195 +extern int gpio_request_one(unsigned gpio, unsigned long flags, const char *label);
  196 +extern int gpio_request_array(struct gpio *array, size_t num);
197 197 extern void gpio_free_array(struct gpio *array, size_t num);
198 198  
199 199 #ifdef CONFIG_GPIO_SYSFS
include/linux/gpio.h
Diff comments   View file @ d8a3515
... ... @@ -30,7 +30,7 @@
30 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 35 return -ENOSYS;
36 36 }
37 37  
... ... @@ -62,12 +62,12 @@
62 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 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 72 return -ENOSYS;
73 73 }