If no pinctrl available just report a warning as some architecture may not need to do anything.
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]> Cc: Linus Walleij <[email protected]> Cc: [email protected] --- drivers/input/keyboard/gpio_keys.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c index 6a68041..c0432fe 100644 --- a/drivers/input/keyboard/gpio_keys.c +++ b/drivers/input/keyboard/gpio_keys.c @@ -29,6 +29,7 @@ #include <linux/of_platform.h> #include <linux/of_gpio.h> #include <linux/spinlock.h> +#include <linux/pinctrl/consumer.h> struct gpio_button_data { const struct gpio_keys_button *button; @@ -666,6 +667,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev) struct input_dev *input; int i, error; int wakeup = 0; + struct pinctrl *pinctrl; if (!pdata) { pdata = gpio_keys_get_devtree_pdata(dev); @@ -673,6 +675,15 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev) return PTR_ERR(pdata); } + pinctrl = devm_pinctrl_get_select_default(dev); + if (IS_ERR(pinctrl)) { + error = PTR_ERR(pinctrl); + if (error == -EPROBE_DEFER) + return error; + + dev_warn(dev, "No pinctrl provided\n"); + } + ddata = kzalloc(sizeof(struct gpio_keys_drvdata) + pdata->nbuttons * sizeof(struct gpio_button_data), GFP_KERNEL); -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-input" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
