github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

regcache: simplify control flow and reduce nesting

Browse Source 
Move the count guard into regcache_hw_init() so callers don't need to
check before calling, and flatten conditional blocks that wrap a single
call by using early returns instead.

Merge the two separate reg_defaults / num_reg_defaults sanity checks
into a single expression, and drop unnecessary else-after-return in
regcache_lookup_reg() and regcache_sync_block().

No functional change.

Assisted-by: LLM
Signed-off-by: Peng Fan <peng.fan@nxp.com>
Link: https://patch.msgid.link/20261002-regmap-lock-2nd-v2-3-e172b0501c52@nxp.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Peng Fan 2026-10-02 21:11:19 +08:00 committed by Mark Brown
parent 7ca8aa98e2
commit 4e1b5ccf1e
1 changed files with 22 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
drivers/base/regmap/regcache.c
View File

@ -58,12 +58,15 @@ static int regcache_count_cacheable_registers(struct regmap *map)
return count;
}
static int regcache_hw_init(struct regmap *map)
static int regcache_hw_init(struct regmap *map, int count)
{
int ret;
unsigned int reg, val;
void *tmp_buf;
if (!count)
return 0;
if (!map->reg_defaults_raw) {
bool cache_bypass = map->cache_bypass;
dev_dbg(map->dev, "No cache defaults, reading back from HW\n");
@ -174,15 +177,8 @@ int regcache_init(struct regmap *map, const struct regmap_config *config)
return 0;
}
if (config->reg_defaults && !config->num_reg_defaults) {
dev_err(map->dev,
"Register defaults are set without the number!\n");
return -EINVAL;
}
if (config->num_reg_defaults && !config->reg_defaults) {
dev_err(map->dev,
"Register defaults number are set without the reg!\n");
if (!!config->reg_defaults != !!config->num_reg_defaults) {
dev_err(map->dev, "reg_defaults and num_reg_defaults must both be specified\n");
return -EINVAL;
}
@ -215,9 +211,7 @@ int regcache_init(struct regmap *map, const struct regmap_config *config)
map->cache = NULL;
map->cache_ops = cache_types[i];
if (!map->cache_ops->read ||
!map->cache_ops->write ||
!map->cache_ops->name)
if (!map->cache_ops->read || !map->cache_ops->write || !map->cache_ops->name)
return -EINVAL;
/* We still need to ensure that the reg_defaults
@ -266,17 +260,17 @@ int regcache_init(struct regmap *map, const struct regmap_config *config)
* we cope with this by reading back the HW registers and
* crafting the cache defaults by hand.
*/
if (count) {
ret = regcache_hw_init(map);
if (ret)
goto err_exit;
}
ret = regcache_hw_init(map, count);
if (ret)
goto err_exit;
if (!map->num_reg_defaults && !map->reg_default_cb)
return 0;
ret = regcache_locked_op(map, map->cache_ops->populate, "Populating");
if (ret)
goto err_free;
if (map->num_reg_defaults || map->reg_default_cb) {
ret = regcache_locked_op(map, map->cache_ops->populate, "Populating");
if (ret)
goto err_free;
}
return 0;
err_free:
@ -762,8 +756,8 @@ int regcache_lookup_reg(struct regmap *map, unsigned int reg)
if (r)
return r - map->reg_defaults;
else
return -ENOENT;
return -ENOENT;
}
static bool regcache_reg_present(unsigned long *cache_present, unsigned int idx)
@ -900,7 +894,7 @@ int regcache_sync_block(struct regmap *map, void *block,
if (regmap_can_raw_write(map) && !map->use_single_write)
return regcache_sync_block_raw(map, block, cache_present,
block_base, start, end);
else
return regcache_sync_block_single(map, block, cache_present,
block_base, start, end);
return regcache_sync_block_single(map, block, cache_present,
block_base, start, end);
}