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

Commit f5b313a2 authored by Mark Brown's avatar Mark Brown
Browse files

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

parents 45942c31 f29a4320

drivers/base/regmap/regcache.c

+11 −2
Original line number Diff line number Diff line
@@ -269,8 +269,11 @@ static int regcache_default_sync(struct regmap *map, unsigned int min, 
		map->cache_bypass = 1;

		ret = _regmap_write(map, reg, val);

		map->cache_bypass = 0;

		if (ret)

		if (ret) {

			dev_err(map->dev, "Unable to sync register %#x. %d\n",

				reg, ret);

			return ret;

		}

		dev_dbg(map->dev, "Synced register %#x, value %#x\n", reg, val);

	}
@@ -615,8 +618,11 @@ static int regcache_sync_block_single(struct regmap *map, void *block, 
		ret = _regmap_write(map, regtmp, val);



		map->cache_bypass = 0;

		if (ret != 0)

		if (ret != 0) {

			dev_err(map->dev, "Unable to sync register %#x. %d\n",

				regtmp, ret);

			return ret;

		}

		dev_dbg(map->dev, "Synced register %#x, value %#x\n",

			regtmp, val);

	}
@@ -641,6 +647,9 @@ static int regcache_sync_block_raw_flush(struct regmap *map, const void **data, 
	map->cache_bypass = 1;



	ret = _regmap_raw_write(map, base, *data, count * val_bytes);

	if (ret)

		dev_err(map->dev, "Unable to sync registers %#x-%#x. %d\n",

			base, cur - map->reg_stride, ret);



	map->cache_bypass = 0;