]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ASoC: remove .get_regmap
authorKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Tue, 8 May 2018 03:19:16 +0000 (03:19 +0000)
committerMark Brown <broonie@kernel.org>
Wed, 9 May 2018 09:38:52 +0000 (18:38 +0900)
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>
include/sound/soc.h
sound/soc/soc-core.c

index 7233d3a206b293f41b1ace65c8c7379b923866f2..309bb70bcb1e4b28c367a50501f8f2129d4fdb0c 100644 (file)
@@ -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);
 
index 96081160fd246a3a5cde836faa1bc53f260affe7..e5af15aa1c28c937c5373f389e5bd015ef4d662d 100644 (file)
@@ -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);