gpiolib: Provide a definition of struct gpio for the stub gpiolib
PATCH 1/1 gpiolib: Provide a definition of struct gpio for the stub gpiolib
This makes the stub gpio_request_array() much more usable as drivers can declare struct gpio variables.
--- include/linux/gpio.h | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)
include/linux/gpio.h +6 -1
@@ -24,7 +24,6 @@#include <linux/errno.h> struct device ; -struct gpio ;struct gpio_chip ;/*
@@ -36,6 +35,12 @@ struct gpio_chip;* warning when something is wrongly called. */ +struct gpio { +unsigned gpio; +unsigned long flags; +const char *label; +}; +static inline bool gpio_is_valid (int number) {return false;
Signature · 1 line
1.7.6.3
Quoted 4 lines · Mark Brown
This makes the stub
gpio_request_array()much more usable as drivers can declare struct gpio variables.Signed-off-by Mark Brown <[email protected]>
Shouldn't this patch remove the definition frominclude/asm-generic/gpio.h at the same time?
g.
Quoted 32 lines
--- include/linux/gpio.h | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)include/linux/gpio.h +6
-1@@ -24,7 +24,6 @@#include <linux/errno.h> struct device ; -struct gpio ;struct gpio_chip ;/* @@ -36,6 +35,12 @@ struct gpio_chip;* warning when something is wrongly called. */ +struct gpio { +unsigned gpio; +unsigned long flags; +const char *label; +}; +static inline bool gpio_is_valid (int number) {return false;Signature · 1 line
1.7.6.3
Quoted 8 lines · Grant Likely
Quoted 4 lines · Mark Brown
This makes the stub
gpio_request_array()much more usable as drivers can declare struct gpio variables.Signed-off-by Mark Brown <[email protected]>Shouldn't this patch remove the definition from
include/asm-generic/gpio.hat the same time?
Both the original forward declaration and the new definition are within the !GPIOLIB case of the #defines, it's just a minimal patch moving the undefined forward declaration to a defintion. I didn't want to worry about reading the individual users to figure out if they had separate defintions separately to the work to get them all moved over to gpiolib.
Quoted 7 lines · Mark Brown
Quoted 5 lines · Grant Likely
Quoted 4 lines · Mark Brown
This makes the stub
gpio_request_array()much more usable as drivers can declare struct gpio variables.Signed-off-by Mark Brown <[email protected]>
Quoted 8 lines
Quoted 2 lines
Shouldn't this patch remove the definition from
include/asm-generic/gpio.hat the same time?Both the original forward declaration and the new definition are within the !GPIOLIB case of the #defines, it's just a minimal patch moving the undefined forward declaration to a defintion. I didn't want to worry about reading the individual users to figure out if they had separate defintions separately to the work to get them all moved over to gpiolib.
I think it's good:
$ git grep asm/gpio.h | grep '\.h:' arch/blackfin/include/asm/portmux.h:#include <asm/gpio.h> arch/sh/include/mach-common/mach/magicpanelr2.h:#include <asm/gpio.h> arch/unicore32/include/asm/gpio.h: * linux/arch/unicore32/include/asm/gpio.h include/asm-generic/gpio.h:/* A platform's <asm/gpio.h> code may want to inline the I/O calls when include/linux/gpio.h:#include <asm/gpio.h>
$ git grep -e $'struct[ \t]*gpio[^_a-z]' `git grep -l asm/gpio.h` `git grep -l mach/portmux.h` `git grep -l mach/magicpanelr2.h`
Documentation/gpio.txt: int gpio_request_array(struct gpio *array, size_t num);
Documentation/gpio.txt: void gpio_free_array(struct gpio *array, size_t num);
Documentation/gpio.txt:Further more, to ease the claim/release of multiple GPIOs, 'struct gpio' is
Documentation/gpio.txt: struct gpio {
Documentation/gpio.txt: static struct gpio leds_gpios[] = {
include/asm-generic/gpio.h: * struct gpio - a structure describing a GPIO with configuration
include/asm-generic/gpio.h:struct gpio {
include/asm-generic/gpio.h:extern int gpio_request_array(const struct gpio *array, size_t num);
include/asm-generic/gpio.h:extern void gpio_free_array(const struct gpio *array, size_t num);
include/linux/gpio.h:struct gpio;
include/linux/gpio.h:static inline int gpio_request_array(const struct gpio *array, size_t num)
include/linux/gpio.h:static inline void gpio_free_array(const struct gpio *array, size_t num)You'll still need a 'struct gpio;' forward decl in asm-generic/gpio.h, but that's better than having two copies. If you craft the patch, I'll make sure some build coverage testing is performed before merging it.
Quoted 4 lines · Grant Likely
You'll still need a 'struct gpio;' forward decl in
asm-generic/gpio.h, but that's better than having two copies. If you craft the patch, I'll make sure some build coverage testing is performed before merging it.
Actually I don't think we don't need the forward declaration as we can just declare the struct prior to including the asm header. Patch to follow...