diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-16 16:05:46 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2013-04-16 16:05:46 +0100 |
| commit | 5b3b44847590b3cbaafdf01d4ad260fa53d04167 (patch) | |
| tree | af353c62902fce0cb8c1205da0977346bd2c915f /drivers/base/regmap/regcache-lzo.c | |
| parent | b508c80c553c03baf5c9ad5612ac8caceb13c5f4 (diff) | |
| parent | 5a08d15602987bbdff3407d7645f95b7a70f1a6f (diff) | |
| download | op-kernel-dev-5b3b44847590b3cbaafdf01d4ad260fa53d04167.zip op-kernel-dev-5b3b44847590b3cbaafdf01d4ad260fa53d04167.tar.gz | |
Merge remote-tracking branch 'regmap/topic/cache' into regmap-next
Diffstat (limited to 'drivers/base/regmap/regcache-lzo.c')
| -rw-r--r-- | drivers/base/regmap/regcache-lzo.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/base/regmap/regcache-lzo.c b/drivers/base/regmap/regcache-lzo.c index afd6aa9..e210a6d 100644 --- a/drivers/base/regmap/regcache-lzo.c +++ b/drivers/base/regmap/regcache-lzo.c @@ -260,8 +260,7 @@ static int regcache_lzo_read(struct regmap *map, ret = regcache_lzo_decompress_cache_block(map, lzo_block); if (ret >= 0) /* fetch the value from the cache */ - *value = regcache_get_val(lzo_block->dst, blkpos, - map->cache_word_size); + *value = regcache_get_val(map, lzo_block->dst, blkpos); kfree(lzo_block->dst); /* restore the pointer and length of the compressed block */ @@ -304,8 +303,7 @@ static int regcache_lzo_write(struct regmap *map, } /* write the new value to the cache */ - if (regcache_set_val(lzo_block->dst, blkpos, value, - map->cache_word_size)) { + if (regcache_set_val(map, lzo_block->dst, blkpos, value)) { kfree(lzo_block->dst); goto out; } |
