diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2016-08-08 08:59:41 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-08-08 11:57:57 +0100 |
| commit | d4fff1ba4768dc7b8dd09db0eee19c1ff098ee60 (patch) | |
| tree | 6cc7b39187fcf1d6b35498b7d4fa2cdf3f262d94 | |
| parent | d25f113f969eb9a0ae3a61d3937a0fbfe7ecdbdd (diff) | |
| download | op-kernel-dev-d4fff1ba4768dc7b8dd09db0eee19c1ff098ee60.zip op-kernel-dev-d4fff1ba4768dc7b8dd09db0eee19c1ff098ee60.tar.gz | |
ASoC: codec duplicated callback function goes to component on pcm3168a
codec driver and component driver has duplicated callback functions,
and codec side functions are just copied to component side when
register timing. This was quick-hack, but no longer needed.
This patch moves these functions from codec driver to component driver.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
| -rw-r--r-- | sound/soc/codecs/pcm3168a.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sound/soc/codecs/pcm3168a.c b/sound/soc/codecs/pcm3168a.c index 992a77e..39bc02d 100644 --- a/sound/soc/codecs/pcm3168a.c +++ b/sound/soc/codecs/pcm3168a.c @@ -599,12 +599,14 @@ EXPORT_SYMBOL_GPL(pcm3168a_regmap); static const struct snd_soc_codec_driver pcm3168a_driver = { .idle_bias_off = true, - .controls = pcm3168a_snd_controls, - .num_controls = ARRAY_SIZE(pcm3168a_snd_controls), - .dapm_widgets = pcm3168a_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(pcm3168a_dapm_widgets), - .dapm_routes = pcm3168a_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(pcm3168a_dapm_routes) + .component_driver = { + .controls = pcm3168a_snd_controls, + .num_controls = ARRAY_SIZE(pcm3168a_snd_controls), + .dapm_widgets = pcm3168a_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(pcm3168a_dapm_widgets), + .dapm_routes = pcm3168a_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(pcm3168a_dapm_routes) + }, }; int pcm3168a_probe(struct device *dev, struct regmap *regmap) |
