projects/linux·commit c474e348

gpio: generic: make bgpio_pdata always visible

c474e348 · Arnd Bergmann <[email protected]> · 2016-01-09 22:16:42 +01:00

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 <[email protected]>
Fixes: 0f4630f3720e ("gpio: generic: factor into gpio_chip struct")
Signed-off-by: Linus Walleij <[email protected]>
Commit
c474e348778bdf5b453a2cdff4b2b1f9e000f343
Parents
96098df1

Changes

1 files changed · +2 −2

FileStatusAddDelContent
include/linux/gpio/driver.hmodified+2−2View file

include/linux/gpio/driver.h

View file
diff --git a/include/linux/gpio/driver.h b/include/linux/gpio/driver.h
index e2d05fd..82fda48 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)
struct gpio_chip *gpiod_to_chip(const struct gpio_desc *desc);
-#if IS_ENABLED(CONFIG_GPIO_GENERIC)
-
struct bgpio_pdata {
const char *label;
int base;
int ngpio;
};
+#if IS_ENABLED(CONFIG_GPIO_GENERIC)
+
int bgpio_init(struct gpio_chip *gc, struct device *dev,
unsigned long sz, void __iomem *dat, void __iomem *set,
void __iomem *clr, void __iomem *dirout, void __iomem *dirin,