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

Commit 65c180fd authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'regmap/topic/cache' into regmap-rbtree

parents b6752123 515f2261

drivers/base/regmap/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -223,7 +223,7 @@ int regcache_set_reg_present(struct regmap *map, unsigned int reg); 
static inline bool regcache_reg_present(struct regmap *map, unsigned int reg)

{

	if (!map->cache_present)

		return true;

		return false;

	if (reg > map->cache_present_nbits)

		return false;

	return map->cache_present[BIT_WORD(reg)] & BIT_MASK(reg);

drivers/base/regmap/regcache.c

+0 −3
Original line number Diff line number Diff line
@@ -241,9 +241,6 @@ int regcache_write(struct regmap *map, 


	BUG_ON(!map->cache_ops);



	if (!regmap_writeable(map, reg))

		return -EIO;



	if (!regmap_volatile(map, reg))

		return map->cache_ops->write(map, reg, value);

drivers/base/regmap/regmap.c

+3 −0
Original line number Diff line number Diff line
@@ -1261,6 +1261,9 @@ int _regmap_write(struct regmap *map, unsigned int reg, 
	int ret;

	void *context = _regmap_map_get_context(map);



	if (!regmap_writeable(map, reg))

		return -EIO;



	if (!map->cache_bypass && !map->defer_caching) {

		ret = regcache_write(map, reg, val);

		if (ret != 0)