Merge tag 'v5.3-rc7' into devel

Linux 5.3-rc7

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/gpio/gpiolib-of.c
Simple merge

diff --cc drivers/gpio/gpiolib.c
index 5163e87969e72890a40945452a90e68def005836,cca749010cd00afe966ac43ae91ae35b756092aa..5b351f87c50a6db29ddd8ecc354c49c71812940f
--- 1/drivers/gpio/gpiolib.c
--- 2/drivers/gpio/gpiolib.c
+++ b/drivers/gpio/gpiolib.c
@@@ -1359,28 -1369,20 +1363,20 @@@ int gpiochip_add_data_with_key(struct g
        INIT_LIST_HEAD(&gdev->pin_ranges);
  #endif
  
 -      status = gpiochip_set_desc_names(chip);
 -      if (status)
 +      ret = gpiochip_set_desc_names(chip);
 +      if (ret)
                goto err_remove_from_list;
  
-       ret = gpiochip_irqchip_init_valid_mask(chip);
-       if (ret)
-               goto err_remove_from_list;
- 
 -      status = gpiochip_alloc_valid_mask(chip);
 -      if (status)
 +      ret = gpiochip_alloc_valid_mask(chip);
 +      if (ret)
-               goto err_remove_irqchip_mask;
- 
-       ret = gpiochip_add_irqchip(chip, lock_key, request_key);
-       if (ret)
-               goto err_free_gpiochip_mask;
+               goto err_remove_from_list;
  
 -      status = of_gpiochip_add(chip);
 -      if (status)
 +      ret = of_gpiochip_add(chip);
 +      if (ret)
-               goto err_remove_chip;
+               goto err_free_gpiochip_mask;
  
 -      status = gpiochip_init_valid_mask(chip);
 -      if (status)
 +      ret = gpiochip_init_valid_mask(chip);
 +      if (ret)
                goto err_remove_of_chip;
  
        for (i = 0; i < chip->ngpio; i++) {
@@@ -1407,9 -1422,9 +1416,9 @@@
         * Otherwise, defer until later.
         */
        if (gpiolib_initialized) {
 -              status = gpiochip_setup_dev(gdev);
 -              if (status)
 +              ret = gpiochip_setup_dev(gdev);
 +              if (ret)
-                       goto err_remove_acpi_chip;
+                       goto err_remove_irqchip;
        }
        return 0;
  

diff --cc include/linux/gpio.h
Simple merge

diff --cc include/linux/gpio/consumer.h
Simple merge