| From 496e7ce2a46562938edcb74f65b26068ee8895f6 Mon Sep 17 00:00:00 2001 |
| From: Geert Uytterhoeven <geert@linux-m68k.org> |
| Date: Thu, 7 May 2015 01:08:08 -0700 |
| Subject: gpiolib: Add missing dummies for the unified device properties interface |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Geert Uytterhoeven <geert@linux-m68k.org> |
| |
| commit 496e7ce2a46562938edcb74f65b26068ee8895f6 upstream. |
| |
| If GPIOLIB=n: |
| |
| drivers/leds/leds-gpio.c: In function ‘gpio_leds_create’: |
| drivers/leds/leds-gpio.c:187: error: implicit declaration of function ‘devm_get_gpiod_from_child’ |
| drivers/leds/leds-gpio.c:187: warning: assignment makes pointer from integer without a cast |
| |
| Add dummies for fwnode_get_named_gpiod() and devm_get_gpiod_from_child() |
| for the !GPIOLIB case to fix this. |
| |
| Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> |
| Fixes: 40b7318319281b1b ("gpio: Support for unified device properties interface") |
| Acked-by: Alexandre Courbot <acourbot@nvidia.com> |
| Acked-by: Linus Walleij <linus.walleij@linaro.org> |
| Signed-off-by: Bryan Wu <cooloney@gmail.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| include/linux/gpio/consumer.h | 15 +++++++++++++++ |
| 1 file changed, 15 insertions(+) |
| |
| --- a/include/linux/gpio/consumer.h |
| +++ b/include/linux/gpio/consumer.h |
| @@ -406,6 +406,21 @@ static inline int desc_to_gpio(const str |
| return -EINVAL; |
| } |
| |
| +/* Child properties interface */ |
| +struct fwnode_handle; |
| + |
| +static inline struct gpio_desc *fwnode_get_named_gpiod( |
| + struct fwnode_handle *fwnode, const char *propname) |
| +{ |
| + return ERR_PTR(-ENOSYS); |
| +} |
| + |
| +static inline struct gpio_desc *devm_get_gpiod_from_child( |
| + struct device *dev, const char *con_id, struct fwnode_handle *child) |
| +{ |
| + return ERR_PTR(-ENOSYS); |
| +} |
| + |
| #endif /* CONFIG_GPIOLIB */ |
| |
| /* |