All of lore.kernel.org
 help / color / mirror / Atom feed
From: Lars-Peter Clausen <lars@metafoo.de>
To: Mark Brown <broonie@kernel.org>, Liam Girdwood <lgirdwood@gmail.com>
Cc: Charles Keepax <ckeepax@opensource.wolfsonmicro.com>,
	patches@opensource.wolfsonmicro.com, alsa-devel@alsa-project.org,
	Lars-Peter Clausen <lars@metafoo.de>
Subject: [PATCH 09/14] ASoC: wm9712: Use table based control setup
Date: Thu, 30 Oct 2014 21:01:06 +0100	[thread overview]
Message-ID: <1414699271-22797-10-git-send-email-lars@metafoo.de> (raw)
In-Reply-To: <1414699271-22797-1-git-send-email-lars@metafoo.de>

Makes the code a bit cleaner.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
 sound/soc/codecs/wm9712.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sound/soc/codecs/wm9712.c b/sound/soc/codecs/wm9712.c
index c389e56..f3aab6e 100644
--- a/sound/soc/codecs/wm9712.c
+++ b/sound/soc/codecs/wm9712.c
@@ -647,8 +647,6 @@ static int wm9712_soc_probe(struct snd_soc_codec *codec)
 	ac97_write(codec, AC97_VIDEO, ac97_read(codec, AC97_VIDEO) | 0x3000);
 
 	wm9712_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-	snd_soc_add_codec_controls(codec, wm9712_snd_ac97_controls,
-				ARRAY_SIZE(wm9712_snd_ac97_controls));
 
 	return 0;
 
@@ -675,6 +673,9 @@ static struct snd_soc_codec_driver soc_codec_dev_wm9712 = {
 	.reg_word_size = sizeof(u16),
 	.reg_cache_step = 2,
 	.reg_cache_default = wm9712_reg,
+
+	.controls = wm9712_snd_ac97_controls,
+	.num_controls = ARRAY_SIZE(wm9712_snd_ac97_controls),
 	.dapm_widgets = wm9712_dapm_widgets,
 	.num_dapm_widgets = ARRAY_SIZE(wm9712_dapm_widgets),
 	.dapm_routes = wm9712_audio_map,
-- 
1.8.0

  parent reply	other threads:[~2014-10-30 20:01 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-30 20:00 [PATCH 00/14] ASoC: AC'97 driver cleanups Lars-Peter Clausen
2014-10-30 20:00 ` [PATCH 01/14] ASoC: ad1980: Remove unused header Lars-Peter Clausen
2014-10-31 17:19   ` Mark Brown
2014-10-30 20:00 ` [PATCH 02/14] ASoC: ad1980: Cleanup printk usage Lars-Peter Clausen
2014-10-31 17:19   ` Mark Brown
2014-10-30 20:01 ` [PATCH 03/14] ASoC: ad1980: Use table based control setup Lars-Peter Clausen
2014-10-31 17:19   ` Mark Brown
2014-10-30 20:01 ` [PATCH 04/14] ASoC: stac9766: Cleanup printk usage Lars-Peter Clausen
2014-10-30 20:01 ` [PATCH 05/14] ASoC: stac9766: Use table based control setup Lars-Peter Clausen
2014-10-30 20:01 ` [PATCH 06/14] ASoC: wm9705: Cleanup printk usage Lars-Peter Clausen
2014-10-30 20:01 ` [PATCH 07/14] ASoC: wm9705: Use table based control setup Lars-Peter Clausen
2014-10-30 20:01 ` [PATCH 08/14] ASoC: wm9712: Cleanup printk usage Lars-Peter Clausen
2014-10-31 17:32   ` Mark Brown
2014-10-30 20:01 ` Lars-Peter Clausen [this message]
2014-10-31 17:32   ` [PATCH 09/14] ASoC: wm9712: Use table based control setup Mark Brown
2014-10-30 20:01 ` [PATCH 10/14] ASoC: wm9713: Cleanup printk usage Lars-Peter Clausen
2014-10-30 20:01 ` [PATCH 11/14] ASoC: wm9713: Use table based control setup Lars-Peter Clausen
2014-10-30 20:01 ` [PATCH 12/14] ASoC: wm9713: Move driver state struct allocation to driver probe Lars-Peter Clausen
2014-10-30 20:01 ` [PATCH 13/14] ASoC: wm9713: Use virtual control instead of virtual register Lars-Peter Clausen
2014-10-30 20:01 ` [PATCH 14/14] ASoC: wm9712/wm9713: Use shared controls Lars-Peter Clausen
2014-10-31 17:40   ` Mark Brown
2014-10-31 17:55     ` Lars-Peter Clausen
2014-10-31 10:35 ` [PATCH 00/14] ASoC: AC'97 driver cleanups Charles Keepax

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1414699271-22797-10-git-send-email-lars@metafoo.de \
    --to=lars@metafoo.de \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=ckeepax@opensource.wolfsonmicro.com \
    --cc=lgirdwood@gmail.com \
    --cc=patches@opensource.wolfsonmicro.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.