Skip to content

Commit 99e2e2a

Browse files
gregkhBrian Maly
authored andcommitted
Revert "regmap: detach regmap from dev on regmap_exit"
This reverts commit f373a189817584d0af5f922e91cad40e45f12314 which is commit 3061e17 upstream. It was backported incorrectly, a fixed version will be applied later. Cc: Cosmin Tanislav <[email protected]> Cc: Mark Brown <[email protected]> Link: https://lore.kernel.org/r/[email protected] Reported-by: Tzung-Bi Shih <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]> (cherry picked from commit e667d5d566a2c17b85188a4023de615b0922a8dc) FOF: 0225 Signed-off-by: Brian Maly <[email protected]>
1 parent 845f8e5 commit 99e2e2a

File tree

1 file changed

+0
-12
lines changed

1 file changed

+0
-12
lines changed

drivers/base/regmap/regmap.c

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -663,17 +663,6 @@ int regmap_attach_dev(struct device *dev, struct regmap *map,
663663
}
664664
EXPORT_SYMBOL_GPL(regmap_attach_dev);
665665

666-
static int dev_get_regmap_match(struct device *dev, void *res, void *data);
667-
668-
static int regmap_detach_dev(struct device *dev, struct regmap *map)
669-
{
670-
if (!dev)
671-
return 0;
672-
673-
return devres_release(dev, dev_get_regmap_release,
674-
dev_get_regmap_match, (void *)map->name);
675-
}
676-
677666
static enum regmap_endian regmap_get_reg_endian(const struct regmap_bus *bus,
678667
const struct regmap_config *config)
679668
{
@@ -1508,7 +1497,6 @@ int regmap_reinit_cache(struct regmap *map, const struct regmap_config *config)
15081497
{
15091498
int ret;
15101499

1511-
regmap_detach_dev(map->dev, map);
15121500
regcache_exit(map);
15131501
regmap_debugfs_exit(map);
15141502

0 commit comments

Comments
 (0)