Skip to content

Commit 3061e17

Browse files
Demon000broonie
authored andcommitted
regmap: detach regmap from dev on regmap_exit
At the end of __regmap_init(), if dev is not NULL, regmap_attach_dev() is called, which adds a devres reference to the regmap, to be able to retrieve a dev's regmap by name using dev_get_regmap(). When calling regmap_exit, the opposite does not happen, and the reference is kept until the dev is detached. Add a regmap_detach_dev() function and call it in regmap_exit() to make sure that the devres reference is not kept. Cc: [email protected] Fixes: 72b39f6 ("regmap: Implement dev_get_regmap()") Signed-off-by: Cosmin Tanislav <[email protected]> Rule: add Link: https://lore.kernel.org/stable/20241128130554.362486-1-demonsingur%40gmail.com Link: https://patch.msgid.link/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 3f1aa0c commit 3061e17

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

drivers/base/regmap/regmap.c

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

601+
static int dev_get_regmap_match(struct device *dev, void *res, void *data);
602+
603+
static int regmap_detach_dev(struct device *dev, struct regmap *map)
604+
{
605+
if (!dev)
606+
return 0;
607+
608+
return devres_release(dev, dev_get_regmap_release,
609+
dev_get_regmap_match, (void *)map->name);
610+
}
611+
601612
static enum regmap_endian regmap_get_reg_endian(const struct regmap_bus *bus,
602613
const struct regmap_config *config)
603614
{
@@ -1445,6 +1456,7 @@ void regmap_exit(struct regmap *map)
14451456
{
14461457
struct regmap_async *async;
14471458

1459+
regmap_detach_dev(map->dev, map);
14481460
regcache_exit(map);
14491461

14501462
regmap_debugfs_exit(map);

0 commit comments

Comments
 (0)