diff options
author | Mark Brown <broonie@kernel.org> | 2016-09-26 09:32:22 -0700 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-09-26 09:32:22 -0700 |
commit | 5c4341199b223a6973b7a18ed43d943a6a897685 (patch) | |
tree | 9646add60c90efa8338ec11855b80d43fd4bf4e3 /sound/soc/codecs/wm8978.c | |
parent | c1d5065a0bd09bac783120b73bfa768ba6a493d9 (diff) | |
parent | 8180bd56bdd1dcade8d1b2a0b6f70b2397bec372 (diff) | |
download | op-kernel-dev-5c4341199b223a6973b7a18ed43d943a6a897685.zip op-kernel-dev-5c4341199b223a6973b7a18ed43d943a6a897685.tar.gz |
Merge branch 'topic/codec-component' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-sunxi
Diffstat (limited to 'sound/soc/codecs/wm8978.c')
-rw-r--r-- | sound/soc/codecs/wm8978.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/sound/soc/codecs/wm8978.c b/sound/soc/codecs/wm8978.c index d36d600..90b2d41 100644 --- a/sound/soc/codecs/wm8978.c +++ b/sound/soc/codecs/wm8978.c @@ -993,18 +993,20 @@ static int wm8978_probe(struct snd_soc_codec *codec) return 0; } -static struct snd_soc_codec_driver soc_codec_dev_wm8978 = { +static const struct snd_soc_codec_driver soc_codec_dev_wm8978 = { .probe = wm8978_probe, .suspend = wm8978_suspend, .resume = wm8978_resume, .set_bias_level = wm8978_set_bias_level, - .controls = wm8978_snd_controls, - .num_controls = ARRAY_SIZE(wm8978_snd_controls), - .dapm_widgets = wm8978_dapm_widgets, - .num_dapm_widgets = ARRAY_SIZE(wm8978_dapm_widgets), - .dapm_routes = wm8978_dapm_routes, - .num_dapm_routes = ARRAY_SIZE(wm8978_dapm_routes), + .component_driver = { + .controls = wm8978_snd_controls, + .num_controls = ARRAY_SIZE(wm8978_snd_controls), + .dapm_widgets = wm8978_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm8978_dapm_widgets), + .dapm_routes = wm8978_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(wm8978_dapm_routes), + }, }; static const struct regmap_config wm8978_regmap_config = { |