Drop gpiolib-rename-static-functions-that-are-called-with.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-6.6/gpiolib-rename-static-functions-that-are-called-with.patch b/queue-6.6/gpiolib-rename-static-functions-that-are-called-with.patch
deleted file mode 100644 (file)
index fc57062..0000000
--- a/queue-6.6/gpiolib-rename-static-functions-that-are-called-with.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 6a5051708c9468dc41ba8a7fe412adc9b6266052 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 15 Dec 2023 16:52:59 +0100
-Subject: gpiolib: rename static functions that are called with the lock taken
-
-From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
-
-[ Upstream commit f95fd4ac155733b5735c84a2e56eee8321232095 ]
-
-Rename two functions that read or modify the global GPIO device list but
-don't take the lock themselves (and need to be called with it already
-acquired). Use the _unlocked() suffix which seems to be used quite
-consistently across the kernel despite there also existing the _locked()
-suffix for the same purpose.
-
-Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
-Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Stable-dep-of: 48e1b4d369cf ("gpiolib: remove the GPIO device from the list when it's unregistered")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpio/gpiolib.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
-index 71492d213ef4..d722b6301906 100644
---- a/drivers/gpio/gpiolib.c
-+++ b/drivers/gpio/gpiolib.c
-@@ -198,7 +198,7 @@ struct gpio_chip *gpiod_to_chip(const struct gpio_desc *desc)
- EXPORT_SYMBOL_GPL(gpiod_to_chip);
- 
- /* dynamic allocation of GPIOs, e.g. on a hotplugged device */
--static int gpiochip_find_base(int ngpio)
-+static int gpiochip_find_base_unlocked(int ngpio)
- {
-       struct gpio_device *gdev;
-       int base = GPIO_DYNAMIC_BASE;
-@@ -271,7 +271,7 @@ EXPORT_SYMBOL_GPL(gpiod_get_direction);
-  * Return -EBUSY if the new chip overlaps with some other chip's integer
-  * space.
-  */
--static int gpiodev_add_to_list(struct gpio_device *gdev)
-+static int gpiodev_add_to_list_unlocked(struct gpio_device *gdev)
- {
-       struct gpio_device *prev, *next;
- 
-@@ -815,7 +815,7 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data,
-        */
-       base = gc->base;
-       if (base < 0) {
--              base = gpiochip_find_base(gc->ngpio);
-+              base = gpiochip_find_base_unlocked(gc->ngpio);
-               if (base < 0) {
-                       spin_unlock_irqrestore(&gpio_lock, flags);
-                       ret = base;
-@@ -835,7 +835,7 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data,
-       }
-       gdev->base = base;
- 
--      ret = gpiodev_add_to_list(gdev);
-+      ret = gpiodev_add_to_list_unlocked(gdev);
-       if (ret) {
-               spin_unlock_irqrestore(&gpio_lock, flags);
-               chip_err(gc, "GPIO integer space overlap, cannot add chip\n");
--- 
-2.43.0
-

diff --git a/queue-6.6/series b/queue-6.6/series
index 9c6bb518d4b5176499113705a6b4a96cdb1cf3fc..6a951287815e313dd59684032442904db6b3650d 100644 (file)
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -328,7 +328,6 @@ drm-amdkfd-fix-type-of-dbg_flags-in-struct-kfd_proce.patch
 gpiolib-make-gpio_device_get-and-gpio_device_put-pub.patch
 gpiolib-provide-gpio_device_find.patch
 gpio-sysfs-drop-the-mention-of-gpiochip_find-from-sy.patch
-gpiolib-rename-static-functions-that-are-called-with.patch
 gpiolib-remove-the-gpio-device-from-the-list-when-it.patch
 ib-iser-prevent-invalidating-wrong-mr.patch
 drm-amdkfd-confirm-list-is-non-empty-before-utilizin.patch

diff --git a/queue-6.7/gpiolib-rename-static-functions-that-are-called-with.patch b/queue-6.7/gpiolib-rename-static-functions-that-are-called-with.patch
deleted file mode 100644 (file)
index 36aee36..0000000
--- a/queue-6.7/gpiolib-rename-static-functions-that-are-called-with.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 8597c621bc223e1a6eb445549d4f621060fe84cc Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Fri, 15 Dec 2023 16:52:59 +0100
-Subject: gpiolib: rename static functions that are called with the lock taken
-
-From: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
-
-[ Upstream commit f95fd4ac155733b5735c84a2e56eee8321232095 ]
-
-Rename two functions that read or modify the global GPIO device list but
-don't take the lock themselves (and need to be called with it already
-acquired). Use the _unlocked() suffix which seems to be used quite
-consistently across the kernel despite there also existing the _locked()
-suffix for the same purpose.
-
-Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
-Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
-Stable-dep-of: 48e1b4d369cf ("gpiolib: remove the GPIO device from the list when it's unregistered")
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/gpio/gpiolib.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/gpio/gpiolib.c b/drivers/gpio/gpiolib.c
-index 95d2a7b2ea3e..9e69d42ff5af 100644
---- a/drivers/gpio/gpiolib.c
-+++ b/drivers/gpio/gpiolib.c
-@@ -276,7 +276,7 @@ struct gpio_chip *gpio_device_get_chip(struct gpio_device *gdev)
- EXPORT_SYMBOL_GPL(gpio_device_get_chip);
- 
- /* dynamic allocation of GPIOs, e.g. on a hotplugged device */
--static int gpiochip_find_base(int ngpio)
-+static int gpiochip_find_base_unlocked(int ngpio)
- {
-       struct gpio_device *gdev;
-       int base = GPIO_DYNAMIC_BASE;
-@@ -349,7 +349,7 @@ EXPORT_SYMBOL_GPL(gpiod_get_direction);
-  * Return -EBUSY if the new chip overlaps with some other chip's integer
-  * space.
-  */
--static int gpiodev_add_to_list(struct gpio_device *gdev)
-+static int gpiodev_add_to_list_unlocked(struct gpio_device *gdev)
- {
-       struct gpio_device *prev, *next;
- 
-@@ -893,7 +893,7 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data,
-        */
-       base = gc->base;
-       if (base < 0) {
--              base = gpiochip_find_base(gc->ngpio);
-+              base = gpiochip_find_base_unlocked(gc->ngpio);
-               if (base < 0) {
-                       spin_unlock_irqrestore(&gpio_lock, flags);
-                       ret = base;
-@@ -913,7 +913,7 @@ int gpiochip_add_data_with_key(struct gpio_chip *gc, void *data,
-       }
-       gdev->base = base;
- 
--      ret = gpiodev_add_to_list(gdev);
-+      ret = gpiodev_add_to_list_unlocked(gdev);
-       if (ret) {
-               spin_unlock_irqrestore(&gpio_lock, flags);
-               chip_err(gc, "GPIO integer space overlap, cannot add chip\n");
--- 
-2.43.0
-

diff --git a/queue-6.7/series b/queue-6.7/series
index a34a87036f4a9ac78ffd596147b5a78057ab87e8..861fd0b164ce71b4ea9b425cd4765b4a05497ec5 100644 (file)
--- a/queue-6.7/series
+++ b/queue-6.7/series
@@ -364,7 +364,6 @@ alsa-scarlett2-add-missing-mutex-lock-around-get-met.patch
 mmc-sdhci_am654-fix-ti-soc-dependencies.patch
 mmc-sdhci_omap-fix-ti-soc-dependencies.patch
 drm-amdkfd-fix-type-of-dbg_flags-in-struct-kfd_proce.patch
-gpiolib-rename-static-functions-that-are-called-with.patch
 gpiolib-remove-the-gpio-device-from-the-list-when-it.patch
 ib-iser-prevent-invalidating-wrong-mr.patch
 drm-amdkfd-confirm-list-is-non-empty-before-utilizin.patch