Commit 96955c96 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'regmap-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap

Pull regmap fixlet from Mark Brown:
 "The only change for regmap this merge window is a single fix for an
  unused variable"

* tag 'regmap-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
  regmap: cache: Remove unused 'blksize' variable
parents 1f0a53f6 daaadbf0
...@@ -236,15 +236,13 @@ static int regcache_lzo_read(struct regmap *map, ...@@ -236,15 +236,13 @@ static int regcache_lzo_read(struct regmap *map,
{ {
struct regcache_lzo_ctx *lzo_block, **lzo_blocks; struct regcache_lzo_ctx *lzo_block, **lzo_blocks;
int ret, blkindex, blkpos; int ret, blkindex, blkpos;
size_t blksize, tmp_dst_len; size_t tmp_dst_len;
void *tmp_dst; void *tmp_dst;
/* index of the compressed lzo block */ /* index of the compressed lzo block */
blkindex = regcache_lzo_get_blkindex(map, reg); blkindex = regcache_lzo_get_blkindex(map, reg);
/* register index within the decompressed block */ /* register index within the decompressed block */
blkpos = regcache_lzo_get_blkpos(map, reg); blkpos = regcache_lzo_get_blkpos(map, reg);
/* size of the compressed block */
blksize = regcache_lzo_get_blksize(map);
lzo_blocks = map->cache; lzo_blocks = map->cache;
lzo_block = lzo_blocks[blkindex]; lzo_block = lzo_blocks[blkindex];
...@@ -275,15 +273,13 @@ static int regcache_lzo_write(struct regmap *map, ...@@ -275,15 +273,13 @@ static int regcache_lzo_write(struct regmap *map,
{ {
struct regcache_lzo_ctx *lzo_block, **lzo_blocks; struct regcache_lzo_ctx *lzo_block, **lzo_blocks;
int ret, blkindex, blkpos; int ret, blkindex, blkpos;
size_t blksize, tmp_dst_len; size_t tmp_dst_len;
void *tmp_dst; void *tmp_dst;
/* index of the compressed lzo block */ /* index of the compressed lzo block */
blkindex = regcache_lzo_get_blkindex(map, reg); blkindex = regcache_lzo_get_blkindex(map, reg);
/* register index within the decompressed block */ /* register index within the decompressed block */
blkpos = regcache_lzo_get_blkpos(map, reg); blkpos = regcache_lzo_get_blkpos(map, reg);
/* size of the compressed block */
blksize = regcache_lzo_get_blksize(map);
lzo_blocks = map->cache; lzo_blocks = map->cache;
lzo_block = lzo_blocks[blkindex]; lzo_block = lzo_blocks[blkindex];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment