summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>2018-05-08 05:19:16 +0200
committerMark Brown <broonie@kernel.org>2018-05-09 11:38:52 +0200
commit2250e76d78e82b1da0f6f571f7211dfa78cbd469 (patch)
treea639fedf7c1d8419deae0624d3f043ba7f61e078
parentASoC: remove codec reg_cache (diff)
downloadlinux-2250e76d78e82b1da0f6f571f7211dfa78cbd469.tar.xz
linux-2250e76d78e82b1da0f6f571f7211dfa78cbd469.zip
ASoC: remove .get_regmap
To setup regmap, ALSA SoC has snd_soc_component_init_regmap() and .get_regmap. But these are duplicated feature. Now, no one is using .get_regmap, let's remove it. Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Reviewed-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--include/sound/soc.h2
-rw-r--r--sound/soc/soc-core.c3
2 files changed, 0 insertions, 5 deletions
diff --git a/include/sound/soc.h b/include/sound/soc.h
index 7233d3a206b2..309bb70bcb1e 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -947,8 +947,6 @@ struct snd_soc_codec_driver {
int (*set_jack)(struct snd_soc_codec *codec,
struct snd_soc_jack *jack, void *data);
- /* codec IO */
- struct regmap *(*get_regmap)(struct device *);
unsigned int (*read)(struct snd_soc_codec *, unsigned int);
int (*write)(struct snd_soc_codec *, unsigned int, unsigned int);
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index 96081160fd24..e5af15aa1c28 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -3392,9 +3392,6 @@ int snd_soc_register_codec(struct device *dev,
codec->component.debugfs_prefix = "codec";
#endif
- if (codec_drv->get_regmap)
- codec->component.regmap = codec_drv->get_regmap(dev);
-
for (i = 0; i < num_dai; i++) {
convert_endianness_formats(&dai_drv[i].playback);
convert_endianness_formats(&dai_drv[i].capture);