Explorar o código

Input: gpio-keys - add support for setting device name

This patch allows to set a device name which helps distinguishing several
gpio-keys devices.

Signed-off-by: Alexander Stein <alexander.stein@informatik.tu-chemnitz.de>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Alexander Stein %!s(int64=14) %!d(string=hai) anos
pai
achega
467112777c
Modificáronse 2 ficheiros con 2 adicións e 1 borrados
  1. 1 1
      drivers/input/keyboard/gpio_keys.c
  2. 1 0
      include/linux/gpio_keys.h

+ 1 - 1
drivers/input/keyboard/gpio_keys.c

@@ -473,7 +473,7 @@ static int __devinit gpio_keys_probe(struct platform_device *pdev)
 	platform_set_drvdata(pdev, ddata);
 	input_set_drvdata(input, ddata);
 
-	input->name = pdev->name;
+	input->name = pdata->name ? : pdev->name;
 	input->phys = "gpio-keys/input0";
 	input->dev.parent = &pdev->dev;
 	input->open = gpio_keys_open;

+ 1 - 0
include/linux/gpio_keys.h

@@ -22,6 +22,7 @@ struct gpio_keys_platform_data {
 	unsigned int rep:1;		/* enable input subsystem auto repeat */
 	int (*enable)(struct device *dev);
 	void (*disable)(struct device *dev);
+	const char *name;		/* input device name */
 };
 
 #endif