diff mbox series

[2/4] input: keyboard: gpio-keys-polled: use input name from pdata if available

Message ID 1555444645-15156-3-git-send-email-info@metux.net
State New, archived
Headers show
Series [1/4] mod_devicetable: helper macro for declaring oftree module device table | expand

Commit Message

Enrico Weigelt, metux IT consult April 16, 2019, 7:57 p.m. UTC
Instead of hardcoding the input name to the driver name
('gpio-keys-polled'), allow the passing a name via platform data
('name' field was already present), but default to old behaviour
in case of NULL.

Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: linux-input@vger.kernel.org
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
 drivers/input/keyboard/gpio_keys_polled.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series


diff --git a/drivers/input/keyboard/gpio_keys_polled.c b/drivers/input/keyboard/gpio_keys_polled.c
index edc7262..3312186 100644
--- a/drivers/input/keyboard/gpio_keys_polled.c
+++ b/drivers/input/keyboard/gpio_keys_polled.c
@@ -272,7 +272,7 @@  static int gpio_keys_polled_probe(struct platform_device *pdev)
 	input = poll_dev->input;
-	input->name = pdev->name;
+	input->name = (pdata->name ? pdata->name : pdev->name);
 	input->phys = DRV_NAME"/input0";
 	input->id.bustype = BUS_HOST;