summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2015-07-17 23:38:34 +0800
committerMark Brown <broonie@kernel.org>2015-07-18 22:30:10 +0100
commitdd9283e23f674281c02cd8cbf894cb3132a4e3a6 (patch)
tree10f68290d4cd6f8c954ab186e38b34cdb46e3331
parente40da86a37f64c73b810bc7a63d77c44dc61accb (diff)
downloadlinux-stable-dd9283e23f674281c02cd8cbf894cb3132a4e3a6.tar.gz
linux-stable-dd9283e23f674281c02cd8cbf894cb3132a4e3a6.tar.bz2
linux-stable-dd9283e23f674281c02cd8cbf894cb3132a4e3a6.zip
ASoC: cs4349: Fix max_register setting for cs4349_regmap
The max_register should be the maximum valid register index rather than number of registers. Also remove unused defines. Signed-off-by: Axel Lin <axel.lin@ingics.com> Acked-by: Tim Howe <tim.howe@cirrus.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/codecs/cs4349.c2
-rw-r--r--sound/soc/codecs/cs4349.h3
2 files changed, 1 insertions, 4 deletions
diff --git a/sound/soc/codecs/cs4349.c b/sound/soc/codecs/cs4349.c
index a8df8a749607..9273b06e918b 100644
--- a/sound/soc/codecs/cs4349.c
+++ b/sound/soc/codecs/cs4349.c
@@ -268,7 +268,7 @@ static struct regmap_config cs4349_regmap = {
.reg_bits = 8,
.val_bits = 8,
- .max_register = CS4349_NUMREGS,
+ .max_register = CS4349_MISC,
.reg_defaults = cs4349_reg_defaults,
.num_reg_defaults = ARRAY_SIZE(cs4349_reg_defaults),
.readable_reg = cs4349_readable_register,
diff --git a/sound/soc/codecs/cs4349.h b/sound/soc/codecs/cs4349.h
index 3884a8907d23..7effa0acec28 100644
--- a/sound/soc/codecs/cs4349.h
+++ b/sound/soc/codecs/cs4349.h
@@ -36,9 +36,6 @@ struct cs4349_platform_data {
#define CS4349_RMPFLT 0x07 /* Ramp and Filter Control */
#define CS4349_MISC 0x08 /* Power Down,Freeze Control,Pop Stop*/
-#define CS4349_FIRSTREG 0x01
-#define CS4349_LASTREG 0x08
-#define CS4349_NUMREGS (CS4349_LASTREG - CS4349_FIRSTREG + 1)
#define CS4349_I2C_INCR 0x80