diff options
| author | Kuninori Morimoto | 2016-08-08 11:16:40 +0200 |
|---|---|---|
| committer | Mark Brown | 2016-08-08 12:57:57 +0200 |
| commit | 88b0f761e296682f24639e9d9fc0122e7a7695c1 (patch) | |
| tree | 72a0a86cc166ec387826662c26b54c49e2fe9d46 /sound/soc/codecs/hdmi-codec.c | |
| parent | ASoC: codec duplicated callback function goes to component on dmic (diff) | |
| download | kernel-qcow2-linux-88b0f761e296682f24639e9d9fc0122e7a7695c1.tar.gz kernel-qcow2-linux-88b0f761e296682f24639e9d9fc0122e7a7695c1.tar.xz kernel-qcow2-linux-88b0f761e296682f24639e9d9fc0122e7a7695c1.zip | |
ASoC: codec duplicated callback function goes to component on hdmi-codec
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>
Diffstat (limited to 'sound/soc/codecs/hdmi-codec.c')
| -rw-r--r-- | sound/soc/codecs/hdmi-codec.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c index f64ecaa0141a..b904492d7744 100644 --- a/sound/soc/codecs/hdmi-codec.c +++ b/sound/soc/codecs/hdmi-codec.c @@ -375,13 +375,13 @@ static int hdmi_of_xlate_dai_name(struct snd_soc_component *component, } static struct snd_soc_codec_driver hdmi_codec = { - .controls = hdmi_controls, - .num_controls = ARRAY_SIZE(hdmi_controls), - .dapm_widgets = hdmi_widgets, - .num_dapm_widgets = ARRAY_SIZE(hdmi_widgets), - .dapm_routes = hdmi_routes, - .num_dapm_routes = ARRAY_SIZE(hdmi_routes), .component_driver = { + .controls = hdmi_controls, + .num_controls = ARRAY_SIZE(hdmi_controls), + .dapm_widgets = hdmi_widgets, + .num_dapm_widgets = ARRAY_SIZE(hdmi_widgets), + .dapm_routes = hdmi_routes, + .num_dapm_routes = ARRAY_SIZE(hdmi_routes), .of_xlate_dai_name = hdmi_of_xlate_dai_name, }, }; |