All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] ASoC: tlv320aic32x4: Use snd_soc_dapm_context as required
@ 2011-03-07 10:32 Dimitris Papastamos
  2011-03-07 10:37 ` Mark Brown
  0 siblings, 1 reply; 2+ messages in thread
From: Dimitris Papastamos @ 2011-03-07 10:32 UTC (permalink / raw)
  To: Mark Brown, Liam Girdwood, Javier Martin; +Cc: alsa-devel, patches

Fix compilation issues by using the snd_soc_dapm_context pointer
whenever it is required.

Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>
---
 sound/soc/codecs/tlv320aic32x4.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/sound/soc/codecs/tlv320aic32x4.c b/sound/soc/codecs/tlv320aic32x4.c
index ee82e38..c6c3520 100644
--- a/sound/soc/codecs/tlv320aic32x4.c
+++ b/sound/soc/codecs/tlv320aic32x4.c
@@ -340,13 +340,15 @@ static inline int aic32x4_get_divs(int mclk, int rate)
 
 static int aic32x4_add_widgets(struct snd_soc_codec *codec)
 {
-	snd_soc_dapm_new_controls(codec, aic32x4_dapm_widgets,
+	struct snd_soc_dapm_context *dapm = &codec->dapm;
+
+	snd_soc_dapm_new_controls(dapm, aic32x4_dapm_widgets,
 				ARRAY_SIZE(aic32x4_dapm_widgets));
 
-	snd_soc_dapm_add_routes(codec, aic32x4_dapm_routes,
+	snd_soc_dapm_add_routes(dapm, aic32x4_dapm_routes,
 				ARRAY_SIZE(aic32x4_dapm_routes));
 
-	snd_soc_dapm_new_widgets(codec);
+	snd_soc_dapm_new_widgets(dapm);
 	return 0;
 }
 
@@ -602,7 +604,7 @@ static int aic32x4_set_bias_level(struct snd_soc_codec *codec,
 	case SND_SOC_BIAS_OFF:
 		break;
 	}
-	codec->bias_level = level;
+	codec->dapm.bias_level = level;
 	return 0;
 }
 
-- 
1.7.4.1

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] ASoC: tlv320aic32x4: Use snd_soc_dapm_context as required
  2011-03-07 10:32 [PATCH] ASoC: tlv320aic32x4: Use snd_soc_dapm_context as required Dimitris Papastamos
@ 2011-03-07 10:37 ` Mark Brown
  0 siblings, 0 replies; 2+ messages in thread
From: Mark Brown @ 2011-03-07 10:37 UTC (permalink / raw)
  To: Dimitris Papastamos; +Cc: alsa-devel, patches, Javier Martin, Liam Girdwood

On Mon, Mar 07, 2011 at 10:32:09AM +0000, Dimitris Papastamos wrote:
> Fix compilation issues by using the snd_soc_dapm_context pointer
> whenever it is required.
> 
> Signed-off-by: Dimitris Papastamos <dp@opensource.wolfsonmicro.com>

I've already done this locally.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2011-03-07 10:37 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-07 10:32 [PATCH] ASoC: tlv320aic32x4: Use snd_soc_dapm_context as required Dimitris Papastamos
2011-03-07 10:37 ` Mark Brown

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.