aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanny Milosavljevic <dannym@scratchpost.org>2016-09-24 16:05:01 -0400
committerMark Brown <broonie@kernel.org>2016-09-26 12:32:32 -0400
commitc9e902f4b37a3c108eb5dc51f1340c09becd7232 (patch)
treea8d4140654d6a85dd0eb8f23b9b34972a81ce51f
parent5c4341199b223a6973b7a18ed43d943a6a897685 (diff)
ASoC: sun4i-codec: Rename sun4i_codec_widgets for consistency
Rename "sun4i_codec_widgets" to "sun4i_codec_controls" for consistency with the struct field name. Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/sunxi/sun4i-codec.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c
index e51f363ff786..e047ec06d538 100644
--- a/sound/soc/sunxi/sun4i-codec.c
+++ b/sound/soc/sunxi/sun4i-codec.c
@@ -509,7 +509,7 @@ static const struct snd_kcontrol_new sun4i_codec_pa_mute =
509 509
510static DECLARE_TLV_DB_SCALE(sun4i_codec_pa_volume_scale, -6300, 100, 1); 510static DECLARE_TLV_DB_SCALE(sun4i_codec_pa_volume_scale, -6300, 100, 1);
511 511
512static const struct snd_kcontrol_new sun4i_codec_widgets[] = { 512static const struct snd_kcontrol_new sun4i_codec_controls[] = {
513 SOC_SINGLE_TLV("Power Amplifier Volume", SUN4I_CODEC_DAC_ACTL, 513 SOC_SINGLE_TLV("Power Amplifier Volume", SUN4I_CODEC_DAC_ACTL,
514 SUN4I_CODEC_DAC_ACTL_PA_VOL, 0x3F, 0, 514 SUN4I_CODEC_DAC_ACTL_PA_VOL, 0x3F, 0,
515 sun4i_codec_pa_volume_scale), 515 sun4i_codec_pa_volume_scale),
@@ -629,8 +629,8 @@ static const struct snd_soc_dapm_route sun4i_codec_codec_dapm_routes[] = {
629 629
630static struct snd_soc_codec_driver sun4i_codec_codec = { 630static struct snd_soc_codec_driver sun4i_codec_codec = {
631 .component_driver = { 631 .component_driver = {
632 .controls = sun4i_codec_widgets, 632 .controls = sun4i_codec_controls,
633 .num_controls = ARRAY_SIZE(sun4i_codec_widgets), 633 .num_controls = ARRAY_SIZE(sun4i_codec_controls),
634 .dapm_widgets = sun4i_codec_codec_dapm_widgets, 634 .dapm_widgets = sun4i_codec_codec_dapm_widgets,
635 .num_dapm_widgets = ARRAY_SIZE(sun4i_codec_codec_dapm_widgets), 635 .num_dapm_widgets = ARRAY_SIZE(sun4i_codec_codec_dapm_widgets),
636 .dapm_routes = sun4i_codec_codec_dapm_routes, 636 .dapm_routes = sun4i_codec_codec_dapm_routes,