Skip to content

Commit d25f113

Browse files
morimotobroonie
authored andcommitted
ASoC: codec duplicated callback function goes to component on pcm512x
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 947cd14 commit d25f113

File tree

1 file changed

+8
-6
lines changed

1 file changed

+8
-6
lines changed

sound/soc/codecs/pcm512x.c

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1348,12 +1348,14 @@ static struct snd_soc_codec_driver pcm512x_codec_driver = {
13481348
.set_bias_level = pcm512x_set_bias_level,
13491349
.idle_bias_off = true,
13501350

1351-
.controls = pcm512x_controls,
1352-
.num_controls = ARRAY_SIZE(pcm512x_controls),
1353-
.dapm_widgets = pcm512x_dapm_widgets,
1354-
.num_dapm_widgets = ARRAY_SIZE(pcm512x_dapm_widgets),
1355-
.dapm_routes = pcm512x_dapm_routes,
1356-
.num_dapm_routes = ARRAY_SIZE(pcm512x_dapm_routes),
1351+
.component_driver = {
1352+
.controls = pcm512x_controls,
1353+
.num_controls = ARRAY_SIZE(pcm512x_controls),
1354+
.dapm_widgets = pcm512x_dapm_widgets,
1355+
.num_dapm_widgets = ARRAY_SIZE(pcm512x_dapm_widgets),
1356+
.dapm_routes = pcm512x_dapm_routes,
1357+
.num_dapm_routes = ARRAY_SIZE(pcm512x_dapm_routes),
1358+
},
13571359
};
13581360

13591361
static const struct regmap_range_cfg pcm512x_range = {

0 commit comments

Comments
 (0)