diff options
author | Arnd Bergmann <arnd@arndb.de> | 2016-01-09 16:16:42 -0500 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2016-01-13 10:00:32 -0500 |
commit | c474e348778bdf5b453a2cdff4b2b1f9e000f343 (patch) | |
tree | 03d274f88046f77e1cab6bf9eca73eba6493710b | |
parent | 96098df125c0a966631ec114081d8f5630a0e4b8 (diff) |
gpio: generic: make bgpio_pdata always visible
Board files that define their own bgpio_pdata are broken when
CONFIG_GPIO_GENERIC is disabled and the bgpio_pdata structure
definition is hidden by the #ifdef:
arch/arm/mach-clps711x/board-autcpu12.c:148:15: error: variable 'autcpu12_mmgpio_pdata' has initializer but incomplete type
static struct bgpio_pdata autcpu12_mmgpio_pdata __initdata = {
arch/arm/mach-clps711x/board-autcpu12.c:149:2: error: unknown field 'base' specified in initializer
.base = AUTCPU12_MMGPIO_BASE,
Since the board files should generally not care what drivers are
enabled, this makes the structure definition visible again.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Fixes: 0f4630f3720e ("gpio: generic: factor into gpio_chip struct")
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
-rw-r--r-- | include/linux/gpio/driver.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h index e2d05fd0e6e3..82fda487453f 100644 --- a/include/linux/gpio/driver.h +++ b/include/linux/gpio/driver.h | |||
@@ -220,14 +220,14 @@ static inline void *gpiochip_get_data(struct gpio_chip *chip) | |||
220 | 220 | ||
221 | struct gpio_chip *gpiod_to_chip(const struct gpio_desc *desc); | 221 | struct gpio_chip *gpiod_to_chip(const struct gpio_desc *desc); |
222 | 222 | ||
223 | #if IS_ENABLED(CONFIG_GPIO_GENERIC) | ||
224 | |||
225 | struct bgpio_pdata { | 223 | struct bgpio_pdata { |
226 | const char *label; | 224 | const char *label; |
227 | int base; | 225 | int base; |
228 | int ngpio; | 226 | int ngpio; |
229 | }; | 227 | }; |
230 | 228 | ||
229 | #if IS_ENABLED(CONFIG_GPIO_GENERIC) | ||
230 | |||
231 | int bgpio_init(struct gpio_chip *gc, struct device *dev, | 231 | int bgpio_init(struct gpio_chip *gc, struct device *dev, |
232 | unsigned long sz, void __iomem *dat, void __iomem *set, | 232 | unsigned long sz, void __iomem *dat, void __iomem *set, |
233 | void __iomem *clr, void __iomem *dirout, void __iomem *dirin, | 233 | void __iomem *clr, void __iomem *dirout, void __iomem *dirin, |