gpiolib: fix up function prototypes etc

Linus Walleij · Linus Walleij · commit 165adc9c1734 · 2012-11-11T19:06:04.000+01:00
Commit 69e1601bca88809dc118abd1becb02c15a02ec71
"gpiolib: provide provision to register pin ranges"

Got most of it's function prototypes wrong, so fix this up by:

- Moving the void declarations into static inlines in
  &lt;linux/gpio.h&gt; (previously the actual prototypes were declared
  here...)

- Declare the gpiochip_add_pin_range() and
  gpiochip_remove_pin_ranges() functions in &lt;asm-generic/gpio.h&gt;
  together with the pin range struct declaration itself.

- Actually only implement these very functions in gpiolib.c
  if CONFIG_PINCTRL is set.

- Additionally export the symbols since modules will need to
  be able to do this.

Reviewed-by: Stephen Warren &lt;swarren@nvidia.com&gt;
Signed-off-by: Linus Walleij &lt;linus.walleij@linaro.org&gt;
diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
@@ -1185,6 +1185,7 @@ struct gpio_chip *gpiochip_find(void *data,
 EXPORT_SYMBOL_GPL(gpiochip_find);
 
 #ifdef CONFIG_PINCTRL
+
 void gpiochip_add_pin_range(struct gpio_chip *chip, const char *pinctl_name,
 		unsigned int pin_base, unsigned int npins)
 {
@@ -1206,6 +1207,7 @@ void gpiochip_add_pin_range(struct gpio_chip *chip, const char *pinctl_name,
 
 	list_add_tail(&pin_range->node, &chip->pin_ranges);
 }
+EXPORT_SYMBOL_GPL(gpiochip_add_pin_range);
 
 void gpiochip_remove_pin_ranges(struct gpio_chip *chip)
 {
@@ -1217,11 +1219,9 @@ void gpiochip_remove_pin_ranges(struct gpio_chip *chip)
 				&pin_range->range);
 	}
 }
-#else
-void gpiochip_add_pin_range(struct gpio_chip *chip, const char *pinctl_name,
-		unsigned int pin_base, unsigned int npins) {}
-void gpiochip_remove_pin_ranges(struct gpio_chip *chip) {}
-#endif
+EXPORT_SYMBOL_GPL(gpiochip_remove_pin_ranges);
+
+#endif /* CONFIG_PINCTRL */
 
 /* These "optional" allocation calls help prevent drivers from stomping
  * on each other, and help provide better diagnostics in debugfs.
diff --git a/include/asm-generic/gpio.h b/include/asm-generic/gpio.h
@@ -49,6 +49,7 @@ struct module;
 struct device_node;
 
 #ifdef CONFIG_PINCTRL
+
 /**
  * struct gpio_pin_range - pin range controlled by a gpio chip
  * @head: list for maintaining set of pin ranges, used internally
@@ -61,6 +62,11 @@ struct gpio_pin_range {
 	struct pinctrl_dev *pctldev;
 	struct pinctrl_gpio_range range;
 };
+
+void gpiochip_add_pin_range(struct gpio_chip *chip, const char *pinctl_name,
+			    unsigned int pin_base, unsigned int npins);
+void gpiochip_remove_pin_ranges(struct gpio_chip *chip);
+
 #endif
 
 /**
diff --git a/include/linux/gpio.h b/include/linux/gpio.h
@@ -72,9 +72,9 @@ static inline int irq_to_gpio(unsigned int irq)
 	return -EINVAL;
 }
 
-#endif
+#endif /* ! CONFIG_ARCH_HAVE_CUSTOM_GPIO_H */
 
-#else
+#else /* ! CONFIG_GENERIC_GPIO */
 
 #include <linux/kernel.h>
 #include <linux/types.h>
@@ -231,9 +231,21 @@ static inline int irq_to_gpio(unsigned irq)
 	return -EINVAL;
 }
 
-void gpiochip_add_pin_range(struct gpio_chip *chip, const char *pinctl_name,
-		unsigned int pin_base, unsigned int npins);
-void gpiochip_remove_pin_ranges(struct gpio_chip *chip);
-#endif
+#ifdef CONFIG_PINCTRL
+
+static inline void
+gpiochip_add_pin_range(struct gpio_chip *chip, const char *pinctl_name,
+		       unsigned int pin_base, unsigned int npins)
+{
+}
+
+static inline void
+gpiochip_remove_pin_ranges(struct gpio_chip *chip)
+{
+}
+
+#endif /* CONFIG_PINCTRL */
+
+#endif /* ! CONFIG_GENERIC_GPIO */
 
 #endif /* __LINUX_GPIO_H */

Original file line number	Diff line number	Diff line change
`@@ -1185,6 +1185,7 @@ struct gpio_chip gpiochip_find(void data,`
`1185`	`1185`	`EXPORT_SYMBOL_GPL(gpiochip_find);`
`1186`	`1186`
`1187`	`1187`	`#ifdef CONFIG_PINCTRL`
	`1188`	`+`
`1188`	`1189`	`void gpiochip_add_pin_range(struct gpio_chip chip, const char pinctl_name,`
`1189`	`1190`	`unsigned int pin_base, unsigned int npins)`
`1190`	`1191`	`{`
`@@ -1206,6 +1207,7 @@ void gpiochip_add_pin_range(struct gpio_chip chip, const char pinctl_name,`
`1206`	`1207`
`1207`	`1208`	`list_add_tail(&pin_range->node, &chip->pin_ranges);`
`1208`	`1209`	`}`
	`1210`	`+EXPORT_SYMBOL_GPL(gpiochip_add_pin_range);`
`1209`	`1211`
`1210`	`1212`	`void gpiochip_remove_pin_ranges(struct gpio_chip *chip)`
`1211`	`1213`	`{`
`@@ -1217,11 +1219,9 @@ void gpiochip_remove_pin_ranges(struct gpio_chip *chip)`
`1217`	`1219`	`&pin_range->range);`
`1218`	`1220`	`}`
`1219`	`1221`	`}`
`1220`		`-#else`
`1221`		`-void gpiochip_add_pin_range(struct gpio_chip chip, const char pinctl_name,`
`1222`		`- unsigned int pin_base, unsigned int npins) {}`
`1223`		`-void gpiochip_remove_pin_ranges(struct gpio_chip *chip) {}`
`1224`		`-#endif`
	`1222`	`+EXPORT_SYMBOL_GPL(gpiochip_remove_pin_ranges);`
	`1223`	`+`
	`1224`	`+#endif /* CONFIG_PINCTRL */`
`1225`	`1225`
`1226`	`1226`	`/* These "optional" allocation calls help prevent drivers from stomping`
`1227`	`1227`	`* on each other, and help provide better diagnostics in debugfs.`