drop queue-5.15/regmap-hold-the-regmap-lock-when-allocating-and-free.patch

diff --git a/queue-5.15/regmap-hold-the-regmap-lock-when-allocating-and-free.patch b/queue-5.15/regmap-hold-the-regmap-lock-when-allocating-and-free.patch
deleted file mode 100644 (file)
index 34bd4a1..0000000
--- a/queue-5.15/regmap-hold-the-regmap-lock-when-allocating-and-free.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 28c8617a36b2b1803e901519c9e6126354aa815f 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 aff2cd48305fa..852b00d30113d 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 893b0615935e9..47fcb00a2c26c 100644
---- a/drivers/base/regmap/regmap.c
-+++ b/drivers/base/regmap/regmap.c
-@@ -1532,6 +1532,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.15/series b/queue-5.15/series
index 9fbd98f8a530e8694f1de72ddfb25bf210a3aa71..ffe8745e48cb474a6a62812ce1e994a7cbb67711 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -433,7 +433,6 @@ wifi-mt76-mt7915-hold-dev-mt76.mutex-while-disabling.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-add-input-value-sanity-checks-for-sta.patch
 x86-ioapic-handle-allocation-failures-gracefully.patch
 alsa-usb-audio-define-macros-for-quirk-table-entries.patch