Skip to content

Commit 947cd14

Browse files
morimotobroonie
authored andcommitted
ASoC: codec duplicated callback function goes to component on rt5616
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 <[email protected]> Signed-off-by: Mark Brown <[email protected]>
1 parent f78bc2b commit 947cd14

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

sound/soc/codecs/rt5616.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1302,12 +1302,14 @@ static struct snd_soc_codec_driver soc_codec_dev_rt5616 = {
13021302
.resume = rt5616_resume,
13031303
.set_bias_level = rt5616_set_bias_level,
13041304
.idle_bias_off = true,
1305-
.controls = rt5616_snd_controls,
1306-
.num_controls = ARRAY_SIZE(rt5616_snd_controls),
1307-
.dapm_widgets = rt5616_dapm_widgets,
1308-
.num_dapm_widgets = ARRAY_SIZE(rt5616_dapm_widgets),
1309-
.dapm_routes = rt5616_dapm_routes,
1310-
.num_dapm_routes = ARRAY_SIZE(rt5616_dapm_routes),
1305+
.component_driver = {
1306+
.controls = rt5616_snd_controls,
1307+
.num_controls = ARRAY_SIZE(rt5616_snd_controls),
1308+
.dapm_widgets = rt5616_dapm_widgets,
1309+
.num_dapm_widgets = ARRAY_SIZE(rt5616_dapm_widgets),
1310+
.dapm_routes = rt5616_dapm_routes,
1311+
.num_dapm_routes = ARRAY_SIZE(rt5616_dapm_routes),
1312+
},
13111313
};
13121314

13131315
static const struct regmap_config rt5616_regmap = {

0 commit comments

Comments
 (0)