diff options
| author |  Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
| 2016-08-08 09:16:04 +0000 |
|---|---|---|
| committer |  Mark Brown <broonie@kernel.org>
| 2016-08-08 11:57:57 +0100 |
| commit | b2fb9a6e5cf0ef6771f821507ccb5ca6efd9acad (patch) | |
| tree | ec884bed0f441ae64767c5407e8ca73f9bc0f3b1 /sound/soc/codecs/da9055.c | |
| parent | ASoC: codec duplicated callback function goes to component on da732x (diff) | |
| download | linux-b2fb9a6e5cf0ef6771f821507ccb5ca6efd9acad.tar.gz linux-b2fb9a6e5cf0ef6771f821507ccb5ca6efd9acad.tar.bz2 linux-b2fb9a6e5cf0ef6771f821507ccb5ca6efd9acad.zip | |
ASoC: codec duplicated callback function goes to component on da9055
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/da9055.c')
| -rw-r--r-- | sound/soc/codecs/da9055.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sound/soc/codecs/da9055.c b/sound/soc/codecs/da9055.c index 0b2ede8db978..4efb5f897a0c 100644 --- a/sound/soc/codecs/da9055.c +++ b/sound/soc/codecs/da9055.c @@ -1455,13 +1455,14 @@ static struct snd_soc_codec_driver soc_codec_dev_da9055 = { .probe = da9055_probe, .set_bias_level = da9055_set_bias_level, - .controls = da9055_snd_controls, - .num_controls = ARRAY_SIZE(da9055_snd_controls), - - .dapm_widgets = da9055_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(da9055_dapm_widgets), - .dapm_routes = da9055_audio_map, - .num_dapm_routes = ARRAY_SIZE(da9055_audio_map), + .component_driver = { + .controls = da9055_snd_controls, + .num_controls = ARRAY_SIZE(da9055_snd_controls), + .dapm_widgets = da9055_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(da9055_dapm_widgets), + .dapm_routes = da9055_audio_map, + .num_dapm_routes = ARRAY_SIZE(da9055_audio_map), + }, }; static const struct regmap_config da9055_regmap_config = { |