Skip to content

Commit f4e52e7

Browse files
committed
Merge tag 'regmap-3.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap
Pull two more small regmap fixes from Mark Brown: - Now we have users for it that aren't running Android it turns out that regcache_sync_region() is much more useful to drivers if it's exported for use by modules. Who knew? - Make sure we don't divide by zero when doing debugfs dumps of rbtrees, not visible up until now because everything was providing at least some cache on startup. * tag 'regmap-3.4-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap: regmap: prevent division by zero in rbtree_show regmap: Export regcache_sync_region()
2 parents a3fac08 + c04c1b9 commit f4e52e7

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

drivers/base/regmap/regcache-rbtree.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,7 @@ static int rbtree_show(struct seq_file *s, void *ignored)
138138
unsigned int base, top;
139139
int nodes = 0;
140140
int registers = 0;
141+
int average;
141142

142143
mutex_lock(&map->lock);
143144

@@ -152,8 +153,13 @@ static int rbtree_show(struct seq_file *s, void *ignored)
152153
registers += top - base + 1;
153154
}
154155

156+
if (nodes)
157+
average = registers / nodes;
158+
else
159+
average = 0;
160+
155161
seq_printf(s, "%d nodes, %d registers, average %d registers\n",
156-
nodes, registers, registers / nodes);
162+
nodes, registers, average);
157163

158164
mutex_unlock(&map->lock);
159165

drivers/base/regmap/regcache.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -346,6 +346,7 @@ int regcache_sync_region(struct regmap *map, unsigned int min,
346346

347347
return ret;
348348
}
349+
EXPORT_SYMBOL_GPL(regcache_sync_region);
349350

350351
/**
351352
* regcache_cache_only: Put a register map into cache only mode

0 commit comments

Comments
 (0)