Commit 3b94bdd1 authored Feb 03, 2017 by Mark Brown

Merge tag 'regmap-v4.10' into regmap-next

regmap: Fix for v4.10

The only change for regmap this merge window is a single fix for an
unused variable.

# gpg: Signature made Mon 12 Dec 2016 17:03:19 CET
# gpg:                using RSA key ADE668AA675718B59FE29FEA24D68B725D5487D0
# gpg:                issuer "broonie@kernel.org"
# gpg: key 0D9EACE2CD7BEEBC: no public key for trusted key - skipped
# gpg: key 0D9EACE2CD7BEEBC marked as ultimately trusted
# gpg: key CCB0A420AF88CD16: no public key for trusted key - skipped
# gpg: key CCB0A420AF88CD16 marked as ultimately trusted
# gpg: key 162614E316005C11: no public key for trusted key - skipped
# gpg: key 162614E316005C11 marked as ultimately trusted
# gpg: key A730C53A5621E907: no public key for trusted key - skipped
# gpg: key A730C53A5621E907 marked as ultimately trusted
# gpg: key 276568D75C6153AD: no public key for trusted key - skipped
# gpg: key 276568D75C6153AD marked as ultimately trusted
# gpg: Good signature from "Mark Brown <broonie@sirena.org.uk>" [ultimate]
# gpg:                 aka "Mark Brown <broonie@debian.org>" [ultimate]
# gpg:                 aka "Mark Brown <broonie@kernel.org>" [ultimate]
# gpg:                 aka "Mark Brown <broonie@tardis.ed.ac.uk>" [ultimate]
# gpg:                 aka "Mark Brown <broonie@linaro.org>" [ultimate]
# gpg:                 aka "Mark Brown <Mark.Brown@linaro.org>" [ultimate]

parents 69973b83 daaadbf0

drivers/base/regmap/regcache-lzo.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -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];