summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2015-08-14 05:58:01 -0400
committerMark Brown <broonie@kernel.org>2015-08-18 12:32:55 -0400
commit84eac6196c4b3930fc81f9bcd76c4a1a2161fd34 (patch)
tree72040379c163491c6a9ac77ec6415e929f41bb12 /sound
parent6f55a041378f8688ab4afd2702416cd5318fa73d (diff)
ASoC: wm8741: Drop misleading readable_reg callback implementation
regmap_readable() returns false if map->format.format_write is set. For .reg_bits = 7, .val_bits = 9, setting, map->format.format_write = regmap_format_7_9_write; Even current code has implemented map->readable_reg, regmap_readable() still returns false anyway. Thus drop the misleading readable_reg callback implementation. Signed-off-by: Axel Lin <axel.lin@ingics.com> Acked-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/wm8741.c21
1 files changed, 0 insertions, 21 deletions
diff --git a/sound/soc/codecs/wm8741.c b/sound/soc/codecs/wm8741.c
index 506792bc833a..c24c1a3f0737 100644
--- a/sound/soc/codecs/wm8741.c
+++ b/sound/soc/codecs/wm8741.c
@@ -61,25 +61,6 @@ static const struct reg_default wm8741_reg_defaults[] = {
61 { 32, 0x0002 }, /* R32 - ADDITONAL_CONTROL_1 */ 61 { 32, 0x0002 }, /* R32 - ADDITONAL_CONTROL_1 */
62}; 62};
63 63
64static bool wm8741_readable(struct device *dev, unsigned int reg)
65{
66 switch (reg) {
67 case WM8741_DACLLSB_ATTENUATION:
68 case WM8741_DACLMSB_ATTENUATION:
69 case WM8741_DACRLSB_ATTENUATION:
70 case WM8741_DACRMSB_ATTENUATION:
71 case WM8741_VOLUME_CONTROL:
72 case WM8741_FORMAT_CONTROL:
73 case WM8741_FILTER_CONTROL:
74 case WM8741_MODE_CONTROL_1:
75 case WM8741_MODE_CONTROL_2:
76 case WM8741_ADDITIONAL_CONTROL_1:
77 return true;
78 default:
79 return false;
80 }
81}
82
83static int wm8741_reset(struct snd_soc_codec *codec) 64static int wm8741_reset(struct snd_soc_codec *codec)
84{ 65{
85 return snd_soc_write(codec, WM8741_RESET, 0); 66 return snd_soc_write(codec, WM8741_RESET, 0);
@@ -541,8 +522,6 @@ static const struct regmap_config wm8741_regmap = {
541 .reg_defaults = wm8741_reg_defaults, 522 .reg_defaults = wm8741_reg_defaults,
542 .num_reg_defaults = ARRAY_SIZE(wm8741_reg_defaults), 523 .num_reg_defaults = ARRAY_SIZE(wm8741_reg_defaults),
543 .cache_type = REGCACHE_RBTREE, 524 .cache_type = REGCACHE_RBTREE,
544
545 .readable_reg = wm8741_readable,
546}; 525};
547 526
548static int wm8741_set_pdata(struct device *dev, struct wm8741_priv *wm8741) 527static int wm8741_set_pdata(struct device *dev, struct wm8741_priv *wm8741)