gpiolib: acpi: Add fwnode name to the GPIO interrupt label

It's ambiguous to have a device-related index in the GPIO interrupt
label as most of the devices will have it the same or very similar.
Extend label with fwnode name for better granularity. It significantly
reduces the scope of searching among devices.

Ex. (for the PCA9355 and MAX3111e chips connected to the system):

=== Before ===
PCA953x:	GpioInt() 0
MAX3111e:	GpioInt() 0

=== After ===
PCA953x:	NIO1 GpioInt(0)
MAX3111e:	URT0 GpioInt(0)

Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c
index 909113312a1bf66b0ac7290169c3da82342bc4c5..0b0c8729fc6ef41b7edea8bcdfc78fe423efb680 100644 (file)
--- a/drivers/gpio/gpiolib-acpi.c
+++ b/drivers/gpio/gpiolib-acpi.c
@@ -1035,6 +1035,7 @@ struct gpio_desc *acpi_find_gpio(struct fwnode_handle *fwnode,
 int acpi_dev_gpio_irq_wake_get_by(struct acpi_device *adev, const char *con_id, int index,
                                  bool *wake_capable)
 {
+       struct fwnode_handle *fwnode = acpi_fwnode_handle(adev);
        int idx, i;
        unsigned int irq_flags;
        int ret;
@@ -1044,7 +1045,7 @@ int acpi_dev_gpio_irq_wake_get_by(struct acpi_device *adev, const char *con_id,
                struct gpio_desc *desc;
 
                /* Ignore -EPROBE_DEFER, it only matters if idx matches */
-               desc = __acpi_find_gpio(acpi_fwnode_handle(adev), con_id, i, true, &info);
+               desc = __acpi_find_gpio(fwnode, con_id, i, true, &info);
                if (IS_ERR(desc) && PTR_ERR(desc) != -EPROBE_DEFER)
                        return PTR_ERR(desc);
 
@@ -1064,7 +1065,7 @@ int acpi_dev_gpio_irq_wake_get_by(struct acpi_device *adev, const char *con_id,
                        acpi_gpio_update_gpiod_flags(&dflags, &info);
                        acpi_gpio_update_gpiod_lookup_flags(&lflags, &info);
 
-                       snprintf(label, sizeof(label), "GpioInt() %d", index);
+                       snprintf(label, sizeof(label), "%pfwP GpioInt(%d)", fwnode, index);
                        ret = gpiod_configure_flags(desc, label, lflags, dflags);
                        if (ret < 0)
                                return ret;