Merge tag 'v6.8-rc7' into gpio/for-next
authorBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Tue, 5 Mar 2024 18:24:34 +0000 (19:24 +0100)
committerBartosz Golaszewski <bartosz.golaszewski@linaro.org>
Tue, 5 Mar 2024 18:24:34 +0000 (19:24 +0100)
Linux 6.8-rc7

1  2 
MAINTAINERS
drivers/gpio/gpiolib.c
include/linux/gpio/driver.h

diff --cc MAINTAINERS
Simple merge
index 6ea71b72c19a61c85606417d7b4134bbb0cd93e7,75be4a3ca7f8443f55a68aff5185044bbbdaa367..e2e583b402072ed7f1a015e351550a07b508b85b
@@@ -1054,23 -997,18 +1054,23 @@@ err_remove_irqchip
        gpiochip_irqchip_remove(gc);
  err_remove_irqchip_mask:
        gpiochip_irqchip_free_valid_mask(gc);
- err_remove_acpi_chip:
+ err_free_hogs:
+       gpiochip_free_hogs(gc);
        acpi_gpiochip_remove(gc);
+       gpiochip_remove_pin_ranges(gc);
  err_remove_of_chip:
-       gpiochip_free_hogs(gc);
        of_gpiochip_remove(gc);
 +err_cleanup_desc_srcu:
 +      for (i = 0; i < gdev->ngpio; i++)
 +              cleanup_srcu_struct(&gdev->descs[i].srcu);
  err_free_gpiochip_mask:
-       gpiochip_remove_pin_ranges(gc);
        gpiochip_free_valid_mask(gc);
 +err_cleanup_gdev_srcu:
 +      cleanup_srcu_struct(&gdev->srcu);
  err_remove_from_list:
 -      spin_lock_irqsave(&gpio_lock, flags);
 -      list_del(&gdev->list);
 -      spin_unlock_irqrestore(&gpio_lock, flags);
 +      scoped_guard(mutex, &gpio_devices_lock)
 +              list_del_rcu(&gdev->list);
 +      synchronize_srcu(&gpio_devices_srcu);
        if (gdev->dev.release) {
                /* release() has been registered by gpiochip_setup_dev() */
                gpio_device_put(gdev);
Simple merge