Skip to content

Commit

Permalink
Revert "gpiolib: annotate gpio-intialization with __must_check"
Browse files Browse the repository at this point in the history
This reverts commit 0fdae42, 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>
  • Loading branch information
torvalds committed Jan 14, 2011
1 parent 6254b32 commit d8a3515
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion Documentation/gpio.txt
Expand Up @@ -135,7 +135,7 @@ setting up a platform_device using the GPIO, is mark its direction:
int gpio_direction_input(unsigned gpio); int gpio_direction_input(unsigned gpio);
int gpio_direction_output(unsigned gpio, int value); int gpio_direction_output(unsigned gpio, int value);


The return value is zero for success, else a negative errno. It must The return value is zero for success, else a negative errno. It should
be checked, since the get/set calls don't have error returns and since be checked, since the get/set calls don't have error returns and since
misconfiguration is possible. You should normally issue these calls from misconfiguration is possible. You should normally issue these calls from
a task context. However, for spinlock-safe GPIOs it's OK to use them a task context. However, for spinlock-safe GPIOs it's OK to use them
Expand Down
10 changes: 5 additions & 5 deletions include/asm-generic/gpio.h
Expand Up @@ -147,11 +147,11 @@ extern struct gpio_chip *gpiochip_find(void *data,
/* Always use the library code for GPIO management calls, /* Always use the library code for GPIO management calls,
* or when sleeping may be involved. * or when sleeping may be involved.
*/ */
extern int __must_check gpio_request(unsigned gpio, const char *label); extern int gpio_request(unsigned gpio, const char *label);
extern void gpio_free(unsigned gpio); extern void gpio_free(unsigned gpio);


extern int __must_check gpio_direction_input(unsigned gpio); extern int gpio_direction_input(unsigned gpio);
extern int __must_check gpio_direction_output(unsigned gpio, int value); extern int gpio_direction_output(unsigned gpio, int value);


extern int gpio_set_debounce(unsigned gpio, unsigned debounce); extern int gpio_set_debounce(unsigned gpio, unsigned debounce);


Expand Down Expand Up @@ -192,8 +192,8 @@ struct gpio {
const char *label; const char *label;
}; };


extern int __must_check gpio_request_one(unsigned gpio, unsigned long flags, const char *label); extern int gpio_request_one(unsigned gpio, unsigned long flags, const char *label);
extern int __must_check gpio_request_array(struct gpio *array, size_t num); extern int gpio_request_array(struct gpio *array, size_t num);
extern void gpio_free_array(struct gpio *array, size_t num); extern void gpio_free_array(struct gpio *array, size_t num);


#ifdef CONFIG_GPIO_SYSFS #ifdef CONFIG_GPIO_SYSFS
Expand Down
6 changes: 3 additions & 3 deletions include/linux/gpio.h
Expand Up @@ -30,7 +30,7 @@ static inline int gpio_is_valid(int number)
return 0; return 0;
} }


static inline int __must_check gpio_request(unsigned gpio, const char *label) static inline int gpio_request(unsigned gpio, const char *label)
{ {
return -ENOSYS; return -ENOSYS;
} }
Expand Down Expand Up @@ -62,12 +62,12 @@ static inline void gpio_free_array(struct gpio *array, size_t num)
WARN_ON(1); WARN_ON(1);
} }


static inline int __must_check gpio_direction_input(unsigned gpio) static inline int gpio_direction_input(unsigned gpio)
{ {
return -ENOSYS; return -ENOSYS;
} }


static inline int __must_check gpio_direction_output(unsigned gpio, int value) static inline int gpio_direction_output(unsigned gpio, int value)
{ {
return -ENOSYS; return -ENOSYS;
} }
Expand Down

0 comments on commit d8a3515

Please sign in to comment.