| From: Kirtika Ruchandani <kirtika@chromium.org> |
| Date: Thu, 24 Nov 2016 16:51:17 -0800 |
| Subject: regmap: cache: Remove unused 'blksize' variable |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| commit daaadbf07433b15c452b2ff411a293b2ccd98e03 upstream. |
| |
| Commit 2cbbb579bcbe ("regmap: Add the LZO cache support") introduced |
| 'blksize' in regcache_lzo_read() and regcache_lzo_write(), that is |
| set but not used. Compiling with W=1 gives the following warnings, |
| fix them. |
| |
| drivers/base/regmap/regcache-lzo.c: In function ‘regcache_lzo_read’: |
| drivers/base/regmap/regcache-lzo.c:239:9: warning: variable ‘blksize’ set but not used [-Wunused-but-set-variable] |
| size_t blksize, tmp_dst_len; |
| ^ |
| drivers/base/regmap/regcache-lzo.c: In function ‘regcache_lzo_write’: |
| drivers/base/regmap/regcache-lzo.c:278:9: warning: variable ‘blksize’ set but not used [-Wunused-but-set-variable] |
| size_t blksize, tmp_dst_len; |
| ^ |
| |
| These are harmless warnings and are only being fixed to reduce the |
| noise with W=1 in the kernel. |
| |
| Fixes: 2cbbb579bcbe ("regmap: Add the LZO cache support") |
| Cc: Dimitris Papastamos <dp@opensource.wolfsonmicro.com> |
| Cc: Mark Brown <broonie@opensource.wolfsonmicro.com> |
| Signed-off-by: Kirtika Ruchandani <kirtika@chromium.org> |
| Signed-off-by: Mark Brown <broonie@kernel.org> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| drivers/base/regmap/regcache-lzo.c | 8 ++------ |
| 1 file changed, 2 insertions(+), 6 deletions(-) |
| |
| --- a/drivers/base/regmap/regcache-lzo.c |
| +++ b/drivers/base/regmap/regcache-lzo.c |
| @@ -229,15 +229,13 @@ static int regcache_lzo_read(struct regm |
| { |
| 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]; |
| |
| @@ -269,15 +267,13 @@ static int regcache_lzo_write(struct reg |
| { |
| 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]; |
| |