Skip to content

Commit b1ef855

Browse files
krzkbroonie
authored andcommitted
regmap: Simplify devres handling
The resource-managed devm_regmap_init() can be a bit simpler by using devm_add_action_or_reset() instead of devres_alloc(). This allows to drop the less-obvious pointer to pointer (struct regmap **ptr) and make devm_regmap_release() interface simpler. Code is functionally equivalent with minor difference: devres_alloc() will happen now after successful resource init (__regmap_init()). Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@oss.qualcomm.com> Link: https://patch.msgid.link/20260305201349.32734-2-krzysztof.kozlowski@oss.qualcomm.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent e7662bc commit b1ef855

1 file changed

Lines changed: 10 additions & 13 deletions

File tree

drivers/base/regmap/regmap.c

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1182,9 +1182,9 @@ struct regmap *__regmap_init(struct device *dev,
11821182
}
11831183
EXPORT_SYMBOL_GPL(__regmap_init);
11841184

1185-
static void devm_regmap_release(struct device *dev, void *res)
1185+
static void devm_regmap_release(void *regmap)
11861186
{
1187-
regmap_exit(*(struct regmap **)res);
1187+
regmap_exit(regmap);
11881188
}
11891189

11901190
struct regmap *__devm_regmap_init(struct device *dev,
@@ -1194,20 +1194,17 @@ struct regmap *__devm_regmap_init(struct device *dev,
11941194
struct lock_class_key *lock_key,
11951195
const char *lock_name)
11961196
{
1197-
struct regmap **ptr, *regmap;
1198-
1199-
ptr = devres_alloc(devm_regmap_release, sizeof(*ptr), GFP_KERNEL);
1200-
if (!ptr)
1201-
return ERR_PTR(-ENOMEM);
1197+
struct regmap *regmap;
1198+
int ret;
12021199

12031200
regmap = __regmap_init(dev, bus, bus_context, config,
12041201
lock_key, lock_name);
1205-
if (!IS_ERR(regmap)) {
1206-
*ptr = regmap;
1207-
devres_add(dev, ptr);
1208-
} else {
1209-
devres_free(ptr);
1210-
}
1202+
if (IS_ERR(regmap))
1203+
return regmap;
1204+
1205+
ret = devm_add_action_or_reset(dev, devm_regmap_release, regmap);
1206+
if (ret)
1207+
return ERR_PTR(ret);
12111208

12121209
return regmap;
12131210
}

0 commit comments

Comments
 (0)