]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Revert "regmap: detach regmap from dev on regmap_exit"
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 21 Jan 2025 13:26:25 +0000 (14:26 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 23 Jan 2025 16:16:03 +0000 (17:16 +0100)
This reverts commit f373a189817584d0af5f922e91cad40e45f12314 which is
commit 3061e170381af96d1e66799d34264e6414d428a7 upstream.

It was backported incorrectly, a fixed version will be applied later.

Cc: Cosmin Tanislav <demonsingur@gmail.com>
Cc: Mark Brown <broonie@kernel.org>
Link: https://lore.kernel.org/r/20250115033244.2540522-1-tzungbi@kernel.org
Reported-by: Tzung-Bi Shih <tzungbi@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/base/regmap/regmap.c

index 00437ed9d5e02cbbefa612f0b1178d406abafadf..85d324fd6a8728e04f075b2bfab7800a31d63e53 100644 (file)
@@ -663,17 +663,6 @@ int regmap_attach_dev(struct device *dev, struct regmap *map,
 }
 EXPORT_SYMBOL_GPL(regmap_attach_dev);
 
-static int dev_get_regmap_match(struct device *dev, void *res, void *data);
-
-static int regmap_detach_dev(struct device *dev, struct regmap *map)
-{
-       if (!dev)
-               return 0;
-
-       return devres_release(dev, dev_get_regmap_release,
-                             dev_get_regmap_match, (void *)map->name);
-}
-
 static enum regmap_endian regmap_get_reg_endian(const struct regmap_bus *bus,
                                        const struct regmap_config *config)
 {
@@ -1508,7 +1497,6 @@ int regmap_reinit_cache(struct regmap *map, const struct regmap_config *config)
 {
        int ret;
 
-       regmap_detach_dev(map->dev, map);
        regcache_exit(map);
        regmap_debugfs_exit(map);