Skip to content

Commit cd86290

Browse files
committed
Revert "regmap: detach regmap from dev on regmap_exit"
This reverts commit 48dc44f which is commit 3061e170381af96d1e66799d34264e6414d428a7 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]>
1 parent 275b834 commit cd86290

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
@@ -652,17 +652,6 @@ int regmap_attach_dev(struct device *dev, struct regmap *map,
652652
}
653653
EXPORT_SYMBOL_GPL(regmap_attach_dev);
654654

655-
static int dev_get_regmap_match(struct device *dev, void *res, void *data);
656-
657-
static int regmap_detach_dev(struct device *dev, struct regmap *map)
658-
{
659-
if (!dev)
660-
return 0;
661-
662-
return devres_release(dev, dev_get_regmap_release,
663-
dev_get_regmap_match, (void *)map->name);
664-
}
665-
666655
static enum regmap_endian regmap_get_reg_endian(const struct regmap_bus *bus,
667656
const struct regmap_config *config)
668657
{
@@ -1513,7 +1502,6 @@ int regmap_reinit_cache(struct regmap *map, const struct regmap_config *config)
15131502
{
15141503
int ret;
15151504

1516-
regmap_detach_dev(map->dev, map);
15171505
regcache_exit(map);
15181506
regmap_debugfs_exit(map);
15191507

0 commit comments

Comments
 (0)