[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20241122151631.220609-1-demonsingur@gmail.com>
Date: Fri, 22 Nov 2024 17:16:30 +0200
From: Cosmin Tanislav <demonsingur@...il.com>
To:
Cc: Mark Brown <broonie@...nel.org>,
Greg Kroah-Hartman <gregkh@...uxfoundation.org>,
"Rafael J . Wysocki" <rafael@...nel.org>,
linux-kernel@...r.kernel.org,
Cosmin Tanislav <demonsingur@...il.com>
Subject: [PATCH] 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, export it and call it in
regmap_exit(), to make sure that the devres reference is not kept.
Signed-off-by: Cosmin Tanislav <demonsingur@...il.com>
---
drivers/base/regmap/regmap.c | 13 +++++++++++++
include/linux/regmap.h | 1 +
2 files changed, 14 insertions(+)
diff --git a/drivers/base/regmap/regmap.c b/drivers/base/regmap/regmap.c
index 53131a7ede0a6..6205c475ed594 100644
--- a/drivers/base/regmap/regmap.c
+++ b/drivers/base/regmap/regmap.c
@@ -598,6 +598,18 @@ 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);
+
+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);
+}
+EXPORT_SYMBOL_GPL(regmap_detach_dev);
+
static enum regmap_endian regmap_get_reg_endian(const struct regmap_bus *bus,
const struct regmap_config *config)
{
@@ -1445,6 +1457,7 @@ void regmap_exit(struct regmap *map)
{
struct regmap_async *async;
+ regmap_detach_dev(map->dev, map);
regcache_exit(map);
regmap_debugfs_exit(map);
diff --git a/include/linux/regmap.h b/include/linux/regmap.h
index fd41baccbf3eb..2a72111f33c4f 100644
--- a/include/linux/regmap.h
+++ b/include/linux/regmap.h
@@ -771,6 +771,7 @@ struct regmap *__devm_regmap_init_fsi(struct fsi_device *fsi_dev,
dev, bus, bus_context, config)
int regmap_attach_dev(struct device *dev, struct regmap *map,
const struct regmap_config *config);
+int regmap_detach_dev(struct device *dev, struct regmap *map);
/**
* regmap_init_i2c() - Initialise register map
--
2.47.0
Powered by blists - more mailing lists