From 9891b52ba12e9d5fed5901b6b5f6e0cdcd424390 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Tue, 3 Mar 2026 10:26:24 +0100 Subject: [PATCH] regcache: Factor out regcache_hw_exit() helper Factor out regcache_hw_exit() helper to make error and exit paths clearer. This helps to avoid missing changes in case the code gets shuffled in the future. Signed-off-by: Andy Shevchenko Link: https://patch.msgid.link/20260303092820.2818138-2-andriy.shevchenko@linux.intel.com Signed-off-by: Mark Brown --- drivers/base/regmap/regcache.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c index 13c480b6e21d..329cdee1ae1c 100644 --- a/drivers/base/regmap/regcache.c +++ b/drivers/base/regmap/regcache.c @@ -131,6 +131,13 @@ static int regcache_hw_init(struct regmap *map, int count) return ret; } +static void regcache_hw_exit(struct regmap *map) +{ + kfree(map->reg_defaults); + if (map->cache_free) + kfree(map->reg_defaults_raw); +} + int regcache_init(struct regmap *map, const struct regmap_config *config) { int count = 0; @@ -245,9 +252,7 @@ int regcache_init(struct regmap *map, const struct regmap_config *config) map->unlock(map->lock_arg); } err_free: - kfree(map->reg_defaults); - if (map->cache_free) - kfree(map->reg_defaults_raw); + regcache_hw_exit(map); return ret; } @@ -259,9 +264,7 @@ void regcache_exit(struct regmap *map) BUG_ON(!map->cache_ops); - kfree(map->reg_defaults); - if (map->cache_free) - kfree(map->reg_defaults_raw); + regcache_hw_exit(map); if (map->cache_ops->exit) { dev_dbg(map->dev, "Destroying %s cache\n",