diff options
| author |   Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2016-08-08 09:19:48 +0000 |
|---|---|---|
| committer |   Mark Brown <broonie@kernel.org> | 2016-08-08 11:57:57 +0100 |
| commit | 3d19c93b7ef6fb76a35a58585df62f9e386a96c2 (patch) | |
| tree | 1f2c3b45f1a28dc572780ca217c090eb4d5a037f /sound/soc/codecs/max98926.c | |
| parent | ASoC: codec duplicated callback function goes to component on max98925 (diff) | |
| download | linux-dev-3d19c93b7ef6fb76a35a58585df62f9e386a96c2.tar.xz linux-dev-3d19c93b7ef6fb76a35a58585df62f9e386a96c2.zip | |
ASoC: codec duplicated callback function goes to component on max98926
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/max98926.c')
| -rw-r--r-- | sound/soc/codecs/max98926.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/sound/soc/codecs/max98926.c b/sound/soc/codecs/max98926.c index 8d14adae5cc5..5830a81e535a 100644 --- a/sound/soc/codecs/max98926.c +++ b/sound/soc/codecs/max98926.c @@ -498,12 +498,14 @@ static int max98926_probe(struct snd_soc_codec *codec) static struct snd_soc_codec_driver soc_codec_dev_max98926 = { .probe = max98926_probe, - .controls = max98926_snd_controls, - .num_controls = ARRAY_SIZE(max98926_snd_controls), - .dapm_routes = max98926_audio_map, - .num_dapm_routes = ARRAY_SIZE(max98926_audio_map), - .dapm_widgets = max98926_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(max98926_dapm_widgets), + .component_driver = { + .controls = max98926_snd_controls, + .num_controls = ARRAY_SIZE(max98926_snd_controls), + .dapm_routes = max98926_audio_map, + .num_dapm_routes = ARRAY_SIZE(max98926_audio_map), + .dapm_widgets = max98926_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(max98926_dapm_widgets), + }, }; static const struct regmap_config max98926_regmap = { |