Re: [PATCH][RESEND] input: adp5589: Make keypad support optional
From: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Date: 2019-10-23 22:59:49
Also in:
lkml
Hi Alexandru, On Wed, Oct 23, 2019 at 10:05:41AM +0300, Alexandru Ardelean wrote:
quoted hunk ↗ jump to hunk
From: Lars-Peter Clausen <lars@metafoo.de> On some platforms the adp5589 is used in GPIO only mode. On these platforms we do not want to register a input device, so make that optional and only create the input device if a keymap is supplied. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Alexandru Ardelean <redacted> --- drivers/input/keyboard/adp5589-keys.c | 197 +++++++++++++++----------- 1 file changed, 111 insertions(+), 86 deletions(-)diff --git a/drivers/input/keyboard/adp5589-keys.c b/drivers/input/keyboard/adp5589-keys.c index 4f96a4a99e5b..08bfa8b213e8 100644 --- a/drivers/input/keyboard/adp5589-keys.c +++ b/drivers/input/keyboard/adp5589-keys.c@@ -495,10 +495,10 @@ static int adp5589_build_gpiomap(struct adp5589_kpad *kpad, return n_unused; } -static int adp5589_gpio_add(struct adp5589_kpad *kpad) +static int adp5589_gpio_add(struct adp5589_kpad *kpad, + const struct adp5589_kpad_platform_data *pdata) { struct device *dev = &kpad->client->dev; - const struct adp5589_kpad_platform_data *pdata = dev_get_platdata(dev); const struct adp5589_gpio_platform_data *gpio_data = pdata->gpio_data; int i, error;
All these changes passing pdata to various functions are not really needed for this patch. I dropped them and applied. Sorry for the delay. -- Dmitry