gpiolib: acpi: Handle deferred list via new API

Introduce a new API and handle deferred list via it which moves
towards isolating the GPIO ACPI and quirk APIs. It will helps
splitting them completely in the next changes.

No functional changes.

Reviewed-by: Hans de Goede <hdegoede@redhat.com>
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 fb573b5f0ba1d8b8622c8c66ac7b99a4ac41c017..ac5f8ec6e72bcd1b22dfc7aa96307eadfb94fab8 100644 (file)
--- a/drivers/gpio/gpiolib-acpi.c
+++ b/drivers/gpio/gpiolib-acpi.c
@@ -350,6 +350,27 @@ static struct gpio_desc *acpi_request_own_gpiod(struct gpio_chip *chip,
        return desc;
 }
 
+bool acpi_gpio_add_to_deferred_list(struct list_head *list)
+{
+       bool defer;
+
+       mutex_lock(&acpi_gpio_deferred_req_irqs_lock);
+       defer = !acpi_gpio_deferred_req_irqs_done;
+       if (defer)
+               list_add(list, &acpi_gpio_deferred_req_irqs_list);
+       mutex_unlock(&acpi_gpio_deferred_req_irqs_lock);
+
+       return defer;
+}
+
+void acpi_gpio_remove_from_deferred_list(struct list_head *list)
+{
+       mutex_lock(&acpi_gpio_deferred_req_irqs_lock);
+       if (!list_empty(list))
+               list_del_init(list);
+       mutex_unlock(&acpi_gpio_deferred_req_irqs_lock);
+}
+
 bool acpi_gpio_in_ignore_list(enum acpi_gpio_ignore_list list, const char *controller_in,
                              unsigned int pin_in)
 {
@@ -536,7 +557,6 @@ void acpi_gpiochip_request_interrupts(struct gpio_chip *chip)
        struct acpi_gpio_chip *acpi_gpio;
        acpi_handle handle;
        acpi_status status;
-       bool defer;
 
        if (!chip->parent || !chip->to_irq)
                return;
@@ -555,14 +575,7 @@ void acpi_gpiochip_request_interrupts(struct gpio_chip *chip)
        acpi_walk_resources(handle, METHOD_NAME__AEI,
                            acpi_gpiochip_alloc_event, acpi_gpio);
 
-       mutex_lock(&acpi_gpio_deferred_req_irqs_lock);
-       defer = !acpi_gpio_deferred_req_irqs_done;
-       if (defer)
-               list_add(&acpi_gpio->deferred_req_irqs_list_entry,
-                        &acpi_gpio_deferred_req_irqs_list);
-       mutex_unlock(&acpi_gpio_deferred_req_irqs_lock);
-
-       if (defer)
+       if (acpi_gpio_add_to_deferred_list(&acpi_gpio->deferred_req_irqs_list_entry))
                return;
 
        acpi_gpiochip_request_irqs(acpi_gpio);
@@ -594,10 +607,7 @@ void acpi_gpiochip_free_interrupts(struct gpio_chip *chip)
        if (ACPI_FAILURE(status))
                return;
 
-       mutex_lock(&acpi_gpio_deferred_req_irqs_lock);
-       if (!list_empty(&acpi_gpio->deferred_req_irqs_list_entry))
-               list_del_init(&acpi_gpio->deferred_req_irqs_list_entry);
-       mutex_unlock(&acpi_gpio_deferred_req_irqs_lock);
+       acpi_gpio_remove_from_deferred_list(&acpi_gpio->deferred_req_irqs_list_entry);
 
        list_for_each_entry_safe_reverse(event, ep, &acpi_gpio->events, node) {
                if (event->irq_requested) {
@@ -615,6 +625,14 @@ void acpi_gpiochip_free_interrupts(struct gpio_chip *chip)
 }
 EXPORT_SYMBOL_GPL(acpi_gpiochip_free_interrupts);
 
+void __init acpi_gpio_process_deferred_list(struct list_head *list)
+{
+       struct acpi_gpio_chip *acpi_gpio, *tmp;
+
+       list_for_each_entry_safe(acpi_gpio, tmp, list, deferred_req_irqs_list_entry)
+               acpi_gpiochip_request_irqs(acpi_gpio);
+}
+
 int acpi_dev_add_driver_gpios(struct acpi_device *adev,
                              const struct acpi_gpio_mapping *gpios)
 {
@@ -1503,14 +1521,8 @@ int acpi_gpio_count(const struct fwnode_handle *fwnode, const char *con_id)
 /* Run deferred acpi_gpiochip_request_irqs() */
 static int __init acpi_gpio_handle_deferred_request_irqs(void)
 {
-       struct acpi_gpio_chip *acpi_gpio, *tmp;
-
        mutex_lock(&acpi_gpio_deferred_req_irqs_lock);
-       list_for_each_entry_safe(acpi_gpio, tmp,
-                                &acpi_gpio_deferred_req_irqs_list,
-                                deferred_req_irqs_list_entry)
-               acpi_gpiochip_request_irqs(acpi_gpio);
-
+       acpi_gpio_process_deferred_list(&acpi_gpio_deferred_req_irqs_list);
        acpi_gpio_deferred_req_irqs_done = true;
        mutex_unlock(&acpi_gpio_deferred_req_irqs_lock);
 

diff --git a/drivers/gpio/gpiolib-acpi.h b/drivers/gpio/gpiolib-acpi.h
index ef0b1a3c85d7cd219a04f0cdafd6c66049f01545..8249977e61400e4ebc38b5d108f8458c98502654 100644 (file)
--- a/drivers/gpio/gpiolib-acpi.h
+++ b/drivers/gpio/gpiolib-acpi.h
@@ -58,6 +58,11 @@ static inline int acpi_gpio_count(const struct fwnode_handle *fwnode,
 }
 #endif
 
+void acpi_gpio_process_deferred_list(struct list_head *list);
+
+bool acpi_gpio_add_to_deferred_list(struct list_head *list);
+void acpi_gpio_remove_from_deferred_list(struct list_head *list);
+
 enum acpi_gpio_ignore_list {
        ACPI_GPIO_IGNORE_WAKE,
        ACPI_GPIO_IGNORE_INTERRUPT,