diff options
| author | Kuninori Morimoto | 2016-08-08 10:47:18 +0200 |
|---|---|---|
| committer | Mark Brown | 2016-08-08 12:57:57 +0200 |
| commit | c90e938ebfc3e239818fbb5abe761837f4f80d53 (patch) | |
| tree | 4ae94ba4ae8b51b4c87d291c376028d1a543ceda | |
| parent | ASoC: remove codec duplicated callback function (diff) | |
| download | kernel-qcow2-linux-c90e938ebfc3e239818fbb5abe761837f4f80d53.tar.gz kernel-qcow2-linux-c90e938ebfc3e239818fbb5abe761837f4f80d53.tar.xz kernel-qcow2-linux-c90e938ebfc3e239818fbb5abe761837f4f80d53.zip | |
ASoC: codec duplicated callback function goes to component on wm8985
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/wm8985.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sound/soc/codecs/wm8985.c b/sound/soc/codecs/wm8985.c index 7347abff4b2c..bcf34730d507 100644 --- a/sound/soc/codecs/wm8985.c +++ b/sound/soc/codecs/wm8985.c @@ -1110,12 +1110,14 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8985 = { .set_bias_level = wm8985_set_bias_level, .suspend_bias_off = true, - .controls = wm8985_common_snd_controls, - .num_controls = ARRAY_SIZE(wm8985_common_snd_controls), - .dapm_widgets = wm8985_common_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(wm8985_common_dapm_widgets), - .dapm_routes = wm8985_common_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(wm8985_common_dapm_routes), + .component_driver = { + .controls = wm8985_common_snd_controls, + .num_controls = ARRAY_SIZE(wm8985_common_snd_controls), + .dapm_widgets = wm8985_common_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm8985_common_dapm_widgets), + .dapm_routes = wm8985_common_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(wm8985_common_dapm_routes), + }, }; static const struct regmap_config wm8985_regmap = { |