Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82cd9965 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

regmap: Add helper function for checking if a register range is volatile 



We already have the same code for checking whether a register range is volatile
in two different places. Instead of duplicating it once more  add a small helper
function for checking whether a register range is voltaile.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 81bf58eb

drivers/base/regmap/regmap.c

+16 −13
Original line number Diff line number Diff line
@@ -64,6 +64,18 @@ bool regmap_precious(struct regmap *map, unsigned int reg) 
	return false;

}



static bool regmap_volatile_range(struct regmap *map, unsigned int reg,

	unsigned int num)

{

	unsigned int i;



	for (i = 0; i < num; i++)

		if (!regmap_volatile(map, reg + i))

			return false;



	return true;

}



static void regmap_format_4_12_write(struct regmap *map,

				     unsigned int reg, unsigned int val)

{
@@ -483,15 +495,11 @@ EXPORT_SYMBOL_GPL(regmap_read); 
int regmap_raw_read(struct regmap *map, unsigned int reg, void *val,

		    size_t val_len)

{

	size_t val_count = val_len / map->format.val_bytes;

	int ret;

	int i;

	bool vol = true;



	for (i = 0; i < val_len / map->format.val_bytes; i++)

		if (!regmap_volatile(map, reg + i))

			vol = false;



	WARN_ON(!vol && map->cache_type != REGCACHE_NONE);

	WARN_ON(!regmap_volatile_range(map, reg, val_count) &&

		map->cache_type != REGCACHE_NONE);



	mutex_lock(&map->lock);
@@ -519,16 +527,11 @@ int regmap_bulk_read(struct regmap *map, unsigned int reg, void *val, 
{

	int ret, i;

	size_t val_bytes = map->format.val_bytes;

	bool vol = true;

	bool vol = regmap_volatile_range(map, reg, val_count);



	if (!map->format.parse_val)

		return -EINVAL;



	/* Is this a block of volatile registers? */

	for (i = 0; i < val_count; i++)

		if (!regmap_volatile(map, reg + i))

			vol = false;



	if (vol || map->cache_type == REGCACHE_NONE) {

		ret = regmap_raw_read(map, reg, val, val_bytes * val_count);

		if (ret != 0)