Input: soc_button_array - use NULL for GPIO connection ID
authorHans de Goede <hdegoede@redhat.com>
Thu, 9 Mar 2017 17:58:30 +0000 (09:58 -0800)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 9 Mar 2017 18:01:04 +0000 (10:01 -0800)
The gpiolib-acpi code is becoming more strict and connection-IDs
may only be used with devices which have a _DSD with matching IDs
in there. Since the soc_button_array ACPI binding is pure index
based pass in NULL as connection-ID to avoid the more strict cheks
resulting in gpiod_count and gpiod_get_index not returning any gpios.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/misc/soc_button_array.c

index ddb2f22fca7aff42ff7c3ae13b7b3f3e18eefafa..0cd2cac47660289d72eeb334f279e6199a07c5c1 100644 (file)
@@ -55,7 +55,7 @@ static int soc_button_lookup_gpio(struct device *dev, int acpi_index)
        struct gpio_desc *desc;
        int gpio;
 
-       desc = gpiod_get_index(dev, KBUILD_MODNAME, acpi_index, GPIOD_ASIS);
+       desc = gpiod_get_index(dev, NULL, acpi_index, GPIOD_ASIS);
        if (IS_ERR(desc))
                return PTR_ERR(desc);
 
@@ -169,7 +169,7 @@ static int soc_button_probe(struct platform_device *pdev)
 
        button_info = (struct soc_button_info *)id->driver_data;
 
-       if (gpiod_count(dev, KBUILD_MODNAME) <= 0) {
+       if (gpiod_count(dev, NULL) <= 0) {
                dev_dbg(dev, "no GPIO attached, ignoring...\n");
                return -ENODEV;
        }