diff options
| author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2016-08-08 12:19:29 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-08-08 13:57:57 +0300 |
| commit | 4a4339d947e8989aa4f81dbc1cf086a11dbeeb89 (patch) | |
| tree | 2f90b05556608f79b458da27c8db64bc8e966819 /sound/soc/codecs/max98925.c | |
| parent | e92b48aa21d41c64ae1a06d69b94c8dfaec9c672 (diff) | |
| download | linux-4a4339d947e8989aa4f81dbc1cf086a11dbeeb89.tar.xz | |
ASoC: codec duplicated callback function goes to component on max98925
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/max98925.c')
| -rw-r--r-- | sound/soc/codecs/max98925.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sound/soc/codecs/max98925.c b/sound/soc/codecs/max98925.c index 5990de317999..327eaa25c9bd 100644 --- a/sound/soc/codecs/max98925.c +++ b/sound/soc/codecs/max98925.c @@ -540,12 +540,14 @@ static int max98925_probe(struct snd_soc_codec *codec) static const struct snd_soc_codec_driver soc_codec_dev_max98925 = { .probe = max98925_probe, - .controls = max98925_snd_controls, - .num_controls = ARRAY_SIZE(max98925_snd_controls), - .dapm_routes = max98925_audio_map, - .num_dapm_routes = ARRAY_SIZE(max98925_audio_map), - .dapm_widgets = max98925_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(max98925_dapm_widgets), + .component_driver = { + .controls = max98925_snd_controls, + .num_controls = ARRAY_SIZE(max98925_snd_controls), + .dapm_routes = max98925_audio_map, + .num_dapm_routes = ARRAY_SIZE(max98925_audio_map), + .dapm_widgets = max98925_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(max98925_dapm_widgets), + }, }; static const struct regmap_config max98925_regmap = { |