diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-13 08:29:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-12-13 08:29:30 -0800 |
| commit | 96955c9682051e70f06103f0d96e26d2f35f4910 (patch) | |
| tree | 07f943fd45b37df34f1a0e2bb6c5f7c9bef22e21 /drivers/base | |
| parent | 1f0a53f623b675e856554f2bb1d6b630ea78125d (diff) | |
| parent | daaadbf07433b15c452b2ff411a293b2ccd98e03 (diff) | |
| download | linux-96955c9682051e70f06103f0d96e26d2f35f4910.tar.bz2 | |
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
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/regmap/regcache-lzo.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/base/regmap/regcache-lzo.c b/drivers/base/regmap/regcache-lzo.c index 6f77d7319fc6..4ff311374c4a 100644 --- a/drivers/base/regmap/regcache-lzo.c +++ b/drivers/base/regmap/regcache-lzo.c @@ -236,15 +236,13 @@ static int regcache_lzo_read(struct regmap *map, { struct regcache_lzo_ctx *lzo_block, **lzo_blocks; int ret, blkindex, blkpos; - size_t blksize, tmp_dst_len; + size_t tmp_dst_len; void *tmp_dst; /* index of the compressed lzo block */ blkindex = regcache_lzo_get_blkindex(map, reg); /* register index within the decompressed block */ blkpos = regcache_lzo_get_blkpos(map, reg); - /* size of the compressed block */ - blksize = regcache_lzo_get_blksize(map); lzo_blocks = map->cache; lzo_block = lzo_blocks[blkindex]; @@ -275,15 +273,13 @@ static int regcache_lzo_write(struct regmap *map, { struct regcache_lzo_ctx *lzo_block, **lzo_blocks; int ret, blkindex, blkpos; - size_t blksize, tmp_dst_len; + size_t tmp_dst_len; void *tmp_dst; /* index of the compressed lzo block */ blkindex = regcache_lzo_get_blkindex(map, reg); /* register index within the decompressed block */ blkpos = regcache_lzo_get_blkpos(map, reg); - /* size of the compressed block */ - blksize = regcache_lzo_get_blksize(map); lzo_blocks = map->cache; lzo_block = lzo_blocks[blkindex]; |