Re: [PATCH] fix typo/compilation error on soc-dapm and at91-i2s

["Raúl Sánchez Siles" <rss@barracuda.es>]

[-- Attachment #1: Type: text/plain, Size: 768 bytes --]

Liam Girdwood wrote:

> On Fri, 2006-12-29 at 12:55 +0000, Liam Girdwood wrote:
>> On Thu, 2006-12-28 at 18:32 +0100, Raúl Sánchez Siles wrote:
>> >   Hello all:
>> > 
>> >   I'm trying to use asoc for an at91 custom board and I had some
>> >   problem
>> > compiling the kernel with the v1.0.14rc1 alsa patch. The problem were
>> > in the debug sections in two files.
>> > 
>> 
>> Thanks, this looks fine. Applied to my tree.
> 
> I've made the following attached alteration the the DAPM debug section
> as the list_entry() is not needed. Can you re submit ?
> 
> Thanks
> 
> Liam

  After some newbie fights with mercurial I get to do it. Find it attached.
Please, let me know if you need anything else.

  Regards,

-- 
Raúl Sánchez Siles

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: typos_asoc_b.patch --]
[-- Type: text/x-diff; name="typos_asoc_b.patch", Size: 4465 bytes --]

# HG changeset patch
# User Raúl Sánchez Siles <rss@barracuda.es>
# Date 1167996612 -3600
# Node ID 589751eead4cd109a78bd9f0ffc85d0b95d2e03c
# Parent  1c7129898e61d6dc47634cab28dd83d750e06176
Solve typos/compilation problems for debug functions in soc-dapm and at91-i2s.

soc-dapm
·Removed list_for_each since the loop is list_for_each_entry() and
 not list_for_each(). Thanks to Liam Girdwood and Seth Forshee.

at91-i2s
·Fixed typo in dai modes definition.
·Fixed struct member name in at91_ssc_info->ssc_state.
·Fixed compilation problem, ssc_state is bundled in at91_ssc_info.

diff -r 1c7129898e61 -r 589751eead4c soc/at91/at91-i2s.c
--- a/soc/at91/at91-i2s.c	Thu Dec 28 15:40:47 2006 +0100
+++ b/soc/at91/at91-i2s.c	Fri Jan 05 12:30:12 2007 +0100
@@ -101,7 +101,7 @@ static struct snd_soc_dai_mode at91_i2s[
 		.pcmdir = AT91_I2S_DIR,
 		.flags = SND_SOC_DAI_BFS_DIV,
 		.fs = 250,
-		.bfs SND_SOC_FSBD(5),
+		.bfs = SND_SOC_FSBD(5),
 		.priv = (13 << 16 | 23),
 	},
 };
@@ -352,19 +352,19 @@ static int at91_i2s_suspend(struct platf
 	ssc_p = &ssc_info[dai->id];
 
 	/* Save the status register before disabling transmit and receive. */
-	ssc_p->state->ssc_sr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_SR);
+	ssc_p->ssc_state.ssc_sr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_SR);
 	at91_ssc_write(ssc_p->ssc.base +
 		AT91_SSC_CR, AT91_SSC_TXDIS | AT91_SSC_RXDIS);
 
 	/* Save the current interrupt mask, then disable unmasked interrupts. */
-	ssc_p->state->ssc_imr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_IMR);
-	at91_ssc_write(ssc_p->ssc.base + AT91_SSC_IDR, ssc_p->state->ssc_imr);
-
-	ssc_p->state->ssc_cmr  = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_CMR);
-	ssc_p->state->ssc_rcmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR);
-	ssc_p->state->ssc_rfmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR);
-	ssc_p->state->ssc_tcmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR);
-	ssc_p->state->ssc_tfmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR);
+	ssc_p->ssc_state.ssc_imr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_IMR);
+	at91_ssc_write(ssc_p->ssc.base + AT91_SSC_IDR, ssc_p->ssc_state.ssc_imr);
+
+	ssc_p->ssc_state.ssc_cmr  = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_CMR);
+	ssc_p->ssc_state.ssc_rcmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR);
+	ssc_p->ssc_state.ssc_rfmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR);
+	ssc_p->ssc_state.ssc_tcmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR);
+	ssc_p->ssc_state.ssc_tfmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR);
 
 	return 0;
 }
@@ -380,17 +380,17 @@ static int at91_i2s_resume(struct platfo
 
 	ssc_p = &ssc_info[dai->id];
 
-	at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->state->ssc_tfmr);
-	at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->state->ssc_tcmr);
-	at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->state->ssc_rfmr);
-	at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->state->ssc_rcmr);
-	at91_ssc_write(ssc_p->ssc.base + AT91_SSC_CMR,  ssc_p->state->ssc_cmr);
-
-	at91_ssc_write(ssc_p->ssc.base + AT91_SSC_IER,  ssc_p->state->ssc_imr);
+	at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->ssc_state.ssc_tfmr);
+	at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->ssc_state.ssc_tcmr);
+	at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->ssc_state.ssc_rfmr);
+	at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->ssc_state.ssc_rcmr);
+	at91_ssc_write(ssc_p->ssc.base + AT91_SSC_CMR,  ssc_p->ssc_state.ssc_cmr);
+
+	at91_ssc_write(ssc_p->ssc.base + AT91_SSC_IER,  ssc_p->ssc_state.ssc_imr);
 
 	at91_ssc_write(ssc_p->ssc.base + AT91_SSC_CR,
-		((ssc_p->state->ssc_sr & AT91_SSC_RXENA) ? AT91_SSC_RXEN : 0) |
-		((ssc_p->state->ssc_sr & AT91_SSC_TXENA) ? AT91_SSC_TXEN : 0));
+		((ssc_p->ssc_state.ssc_sr & AT91_SSC_RXENA) ? AT91_SSC_RXEN : 0) |
+		((ssc_p->ssc_state.ssc_sr & AT91_SSC_TXENA) ? AT91_SSC_TXEN : 0));
 
 	return 0;
 }
diff -r 1c7129898e61 -r 589751eead4c soc/soc-dapm.c
--- a/soc/soc-dapm.c	Thu Dec 28 15:40:47 2006 +0100
+++ b/soc/soc-dapm.c	Fri Jan 05 12:30:12 2007 +0100
@@ -651,7 +651,6 @@ static void dbg_dump_dapm(struct snd_soc
 							p->source->name);
 				}
 				list_for_each_entry(p, &w->sinks, list_source) {
-					p = list_entry(lp, struct snd_soc_dapm_path, list_source);
 					if (p->connect)
 						printk(" out %s %s\n", p->name ? p->name : "static",
 							p->sink->name);

[-- Attachment #3: Type: text/plain, Size: 347 bytes --]

-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV

[-- Attachment #4: Type: text/plain, Size: 161 bytes --]

_______________________________________________
Alsa-devel mailing list
Alsa-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/alsa-devel