[PATCH v3 2/3] regcache: Define iterator inside for-loop and align their types

Andy Shevchenko
2026-02-26T13:59:23Z

Some of the iterators may be defined inside the respective for-loop
reducing the scope and potential risk of their misuse. While at it,
align their types based on the type of the upper or lower limits.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/base/regmap/internal.h | 2 +-
drivers/base/regmap/regcache.c | 13 ++++++-------
2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/drivers/base/regmap/internal.h b/drivers/base/regmap/internal.h
index 5bf993165438..c77f3a49a89e 100644
--- a/drivers/base/regmap/internal.h
+++ b/drivers/base/regmap/internal.h
@@ -162,7 +162,7 @@ struct regmap {
bool no_sync_defaults;

struct reg_sequence *patch;
- int patch_regs;
+ unsigned int patch_regs;

/* if set, the regmap core can sleep */
bool can_sleep;
diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c
index bde60255ddbb..4a27fb871877 100644
--- a/drivers/base/regmap/regcache.c
+++ b/drivers/base/regmap/regcache.c
@@ -44,11 +44,11 @@ EXPORT_SYMBOL_GPL(regcache_sort_defaults);

static int regcache_count_cacheable_registers(struct regmap *map)
{
- int count;
- int i;
+ unsigned int count;

/* calculate the size of reg_defaults */
- for (count = 0, i = 0; i < map->num_reg_defaults_raw; i++)
+ count = 0;
+ for (unsigned int i = 0; i < map->num_reg_defaults_raw; i++)
if (regmap_readable(map, i * map->reg_stride) &&
!regmap_volatile(map, i * map->reg_stride))
count++;
@@ -62,7 +62,6 @@ static int regcache_count_cacheable_registers(struct regmap *map)

static int regcache_hw_init(struct regmap *map, int count)
{
- int i, j;
int ret;
unsigned int reg, val;
void *tmp_buf;
@@ -103,7 +102,7 @@ static int regcache_hw_init(struct regmap *map, int count)
}

/* fill the reg_defaults */
- for (i = 0, j = 0; i < map->num_reg_defaults_raw; i++) {
+ for (unsigned int i = 0, j = 0; i < map->num_reg_defaults_raw; i++) {
reg = i * map->reg_stride;

if (!regmap_readable(map, reg))
@@ -849,13 +848,13 @@ static int regcache_sync_block_raw(struct regmap *map, void *block,
unsigned int block_base, unsigned int start,
unsigned int end)
{
- unsigned int i, val;
unsigned int regtmp = 0;
unsigned int base = 0;
const void *data = NULL;
+ unsigned int val;
int ret;

- for (i = start; i < end; i++) {
+ for (unsigned int i = start; i < end; i++) {
regtmp = block_base + (i * map->reg_stride);

if (!regcache_reg_present(cache_present, i) ||
--
2.50.1