drop regmap patches from older trees

diff --git a/queue-4.19/regmap-hold-the-regmap-lock-when-allocating-and-free.patch b/queue-4.19/regmap-hold-the-regmap-lock-when-allocating-and-free.patch
deleted file mode 100644 (file)
index 5bf8f9c..0000000
--- a/queue-4.19/regmap-hold-the-regmap-lock-when-allocating-and-free.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From f4f0ff0ff39cd475cc0a40b0f9f1347ff0688925 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 22 Aug 2024 20:13:36 +0100
-Subject: regmap: Hold the regmap lock when allocating and freeing the cache
-
-From: Mark Brown <broonie@kernel.org>
-
-[ Upstream commit fd4ebc07b4dff7e1abedf1b7fd477bc04b69ae55 ]
-
-For the benefit of the maple tree's lockdep checking hold the lock while
-creating and exiting the cache.
-
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Link: https://patch.msgid.link/20240822-b4-regmap-maple-nolock-v1-2-d5e6dbae3396@kernel.org
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/base/regmap/regcache.c | 4 ++++
- drivers/base/regmap/regmap.c   | 1 +
- 2 files changed, 5 insertions(+)
-
-diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c
-index b78e4b6e2c9da..b86fefa4b089e 100644
---- a/drivers/base/regmap/regcache.c
-+++ b/drivers/base/regmap/regcache.c
-@@ -193,7 +193,9 @@ int regcache_init(struct regmap *map, const struct regmap_config *config)
-       if (map->cache_ops->init) {
-               dev_dbg(map->dev, "Initializing %s cache\n",
-                       map->cache_ops->name);
-+              map->lock(map->lock_arg);
-               ret = map->cache_ops->init(map);
-+              map->unlock(map->lock_arg);
-               if (ret)
-                       goto err_free;
-       }
-@@ -221,7 +223,9 @@ void regcache_exit(struct regmap *map)
-       if (map->cache_ops->exit) {
-               dev_dbg(map->dev, "Destroying %s cache\n",
-                       map->cache_ops->name);
-+              map->lock(map->lock_arg);
-               map->cache_ops->exit(map);
-+              map->unlock(map->lock_arg);
-       }
- }
- 
-diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
-index 5e03735374ae2..75b793af4781a 100644
---- a/drivers/base/regmap/regmap.c
-+++ b/drivers/base/regmap/regmap.c
-@@ -1312,6 +1312,7 @@ void regmap_exit(struct regmap *map)
-       struct regmap_async *async;
- 
-       regcache_exit(map);
-+
-       regmap_debugfs_exit(map);
-       regmap_range_exit(map);
-       if (map->bus && map->bus->free_context)
--- 
-2.43.0
-

diff --git a/queue-4.19/series b/queue-4.19/series
index d2482fdfd8932d1ba6b1aef41cfec87cfb96aef8..482e703c260bd00978ba8b15cdf34631fb8dc921 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -160,7 +160,6 @@ tcp-avoid-reusing-fin_wait2-when-trying-to-find-port.patch
 acpica-iasl-handle-empty-connection_node.patch
 wifi-mwifiex-fix-memcpy-field-spanning-write-warning.patch
 signal-replace-bug_on-s.patch
-regmap-hold-the-regmap-lock-when-allocating-and-free.patch
 alsa-asihpi-fix-potential-oob-array-access.patch
 alsa-hdsp-break-infinite-midi-input-flush-loop.patch
 fbdev-pxafb-fix-possible-use-after-free-in-pxafb_tas.patch

diff --git a/queue-5.10/regmap-hold-the-regmap-lock-when-allocating-and-free.patch b/queue-5.10/regmap-hold-the-regmap-lock-when-allocating-and-free.patch
deleted file mode 100644 (file)
index 3d8bc22..0000000
--- a/queue-5.10/regmap-hold-the-regmap-lock-when-allocating-and-free.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 5f80ff9517a15432443f9005efa75fd2523dceb3 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 22 Aug 2024 20:13:36 +0100
-Subject: regmap: Hold the regmap lock when allocating and freeing the cache
-
-From: Mark Brown <broonie@kernel.org>
-
-[ Upstream commit fd4ebc07b4dff7e1abedf1b7fd477bc04b69ae55 ]
-
-For the benefit of the maple tree's lockdep checking hold the lock while
-creating and exiting the cache.
-
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Link: https://patch.msgid.link/20240822-b4-regmap-maple-nolock-v1-2-d5e6dbae3396@kernel.org
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/base/regmap/regcache.c | 4 ++++
- drivers/base/regmap/regmap.c   | 1 +
- 2 files changed, 5 insertions(+)
-
-diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c
-index 7fdd702e564ae..2bd3394ef80bd 100644
---- a/drivers/base/regmap/regcache.c
-+++ b/drivers/base/regmap/regcache.c
-@@ -189,7 +189,9 @@ int regcache_init(struct regmap *map, const struct regmap_config *config)
-       if (map->cache_ops->init) {
-               dev_dbg(map->dev, "Initializing %s cache\n",
-                       map->cache_ops->name);
-+              map->lock(map->lock_arg);
-               ret = map->cache_ops->init(map);
-+              map->unlock(map->lock_arg);
-               if (ret)
-                       goto err_free;
-       }
-@@ -217,7 +219,9 @@ void regcache_exit(struct regmap *map)
-       if (map->cache_ops->exit) {
-               dev_dbg(map->dev, "Destroying %s cache\n",
-                       map->cache_ops->name);
-+              map->lock(map->lock_arg);
-               map->cache_ops->exit(map);
-+              map->unlock(map->lock_arg);
-       }
- }
- 
-diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
-index a3c4086603a60..68a3b619c06ec 100644
---- a/drivers/base/regmap/regmap.c
-+++ b/drivers/base/regmap/regmap.c
-@@ -1494,6 +1494,7 @@ void regmap_exit(struct regmap *map)
-       struct regmap_async *async;
- 
-       regcache_exit(map);
-+
-       regmap_debugfs_exit(map);
-       regmap_range_exit(map);
-       if (map->bus && map->bus->free_context)
--- 
-2.43.0
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 7cafe7ee220bf42de4b490edd425efec63dc8d30..9e1b25875dd2be2af09e9e78ac9574a906f2d3a5 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -317,7 +317,6 @@ proc-add-config-param-to-block-forcing-mem-writes.patch
 wifi-mwifiex-fix-memcpy-field-spanning-write-warning.patch
 nfp-use-irqf_no_autoen-flag-in-request_irq.patch
 signal-replace-bug_on-s.patch
-regmap-hold-the-regmap-lock-when-allocating-and-free.patch
 alsa-usb-audio-define-macros-for-quirk-table-entries.patch
 alsa-usb-audio-add-logitech-audio-profile-quirk.patch
 alsa-asihpi-fix-potential-oob-array-access.patch

diff --git a/queue-5.4/regmap-hold-the-regmap-lock-when-allocating-and-free.patch b/queue-5.4/regmap-hold-the-regmap-lock-when-allocating-and-free.patch
deleted file mode 100644 (file)
index 20f5f76..0000000
--- a/queue-5.4/regmap-hold-the-regmap-lock-when-allocating-and-free.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From cfeaeea531577e4a93c02e916e83da63b3dc4d2b Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 22 Aug 2024 20:13:36 +0100
-Subject: regmap: Hold the regmap lock when allocating and freeing the cache
-
-From: Mark Brown <broonie@kernel.org>
-
-[ Upstream commit fd4ebc07b4dff7e1abedf1b7fd477bc04b69ae55 ]
-
-For the benefit of the maple tree's lockdep checking hold the lock while
-creating and exiting the cache.
-
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Link: https://patch.msgid.link/20240822-b4-regmap-maple-nolock-v1-2-d5e6dbae3396@kernel.org
-Signed-off-by: Mark Brown <broonie@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/base/regmap/regcache.c | 4 ++++
- drivers/base/regmap/regmap.c   | 1 +
- 2 files changed, 5 insertions(+)
-
-diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c
-index 7fdd702e564ae..2bd3394ef80bd 100644
---- a/drivers/base/regmap/regcache.c
-+++ b/drivers/base/regmap/regcache.c
-@@ -189,7 +189,9 @@ int regcache_init(struct regmap *map, const struct regmap_config *config)
-       if (map->cache_ops->init) {
-               dev_dbg(map->dev, "Initializing %s cache\n",
-                       map->cache_ops->name);
-+              map->lock(map->lock_arg);
-               ret = map->cache_ops->init(map);
-+              map->unlock(map->lock_arg);
-               if (ret)
-                       goto err_free;
-       }
-@@ -217,7 +219,9 @@ void regcache_exit(struct regmap *map)
-       if (map->cache_ops->exit) {
-               dev_dbg(map->dev, "Destroying %s cache\n",
-                       map->cache_ops->name);
-+              map->lock(map->lock_arg);
-               map->cache_ops->exit(map);
-+              map->unlock(map->lock_arg);
-       }
- }
- 
-diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
-index aa9c6e0ff878d..9f13c167bdae4 100644
---- a/drivers/base/regmap/regmap.c
-+++ b/drivers/base/regmap/regmap.c
-@@ -1348,6 +1348,7 @@ void regmap_exit(struct regmap *map)
-       struct regmap_async *async;
- 
-       regcache_exit(map);
-+
-       regmap_debugfs_exit(map);
-       regmap_range_exit(map);
-       if (map->bus && map->bus->free_context)
--- 
-2.43.0
-

diff --git a/queue-5.4/series b/queue-5.4/series
index 466ae56bff6744b831867fdb24191c88e379525f..7e97169e21cd4ff44bdd47c74833d6855a8bd090 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -213,7 +213,6 @@ proc-add-config-param-to-block-forcing-mem-writes.patch
 wifi-mwifiex-fix-memcpy-field-spanning-write-warning.patch
 nfp-use-irqf_no_autoen-flag-in-request_irq.patch
 signal-replace-bug_on-s.patch
-regmap-hold-the-regmap-lock-when-allocating-and-free.patch
 alsa-asihpi-fix-potential-oob-array-access.patch
 alsa-hdsp-break-infinite-midi-input-flush-loop.patch
 x86-syscall-avoid-memcpy-for-ia32-syscall_get_argume.patch