fix typo/compilation error on soc-dapm and at91-i2s
PATCH 1/1 fix typo/compilation error on soc-dapm and at91-i2s
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.
I attach a patch to correct this problems. I'm new sending patches to alsa,
so if you think I did something wrong just let me know and I'll do my best.
Note: please put me in CC since i'm not subscribed to the list.
Thanks,
Signature · 7 lines
Raúl Sánchez Siles Barracuda Systems S.L. C/ Luxemburgo, 4 - Local Pozuelo de Alarcón 28224 Madrid Tlf.: +34 91 351 11 20 Fax: +34 91 352 54 44
# HG changeset patch
# User Raúl Sánchez Siles <[email protected]>
# Date 1167325268 -3600
# Node ID 80537c953b2dc530cc7bfb6bad13f2abe956fcc4
# Parent 1c7129898e61d6dc47634cab28dd83d750e06176
Solve typos/compilation problems for debug functions in soc-dapm and at91-i2s.
soc-dapm
·Fixed typo in soc-dapm.
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.
soc/at91/at91-i2s.c +19 -19
@@ -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 ; }
soc/soc-dapm.c +1 -1
@@ -651,7 +651,7 @@ 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); + p = list_entry(p, struct snd_soc_dapm_path, list_source);if (p->connect)printk (" out %s %s\n" , p->name ? p->name :"static" , p->sink->name);
-------------------------------------------------------------------------
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
_______________________________________________
Alsa-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/alsa-devel
Quoted 9 lines · Raúl Sánchez Siles
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.I attach a patch to correct this problems. I'm new sending patches to alsa,
so if you think I did something wrong just let me know and I'll do my best.
Thanks, this looks fine. Applied to my tree.
Fwiw, Frank sent me an AT91 bug fix last week, although due to other work, I've not had a chance to apply or submit yet.
Frank, any chance you can submit. It's in my patch inbox at the office and I won't be back until the 3rd.
Thanks
Liam
-------------------------------------------------------------------------
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
_______________________________________________
Alsa-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/alsa-devel
Quoted 16 lines · Liam Girdwood
Quoted 9 lines · Raúl Sánchez Siles
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.I attach a patch to correct this problems. I'm new sending patches to alsa,
so if you think I did something wrong just let me know and I'll do my best.Thanks, this looks fine. Applied to my tree.
Fwiw, Frank sent me an AT91 bug fix last week, although due to other work, I've not had a chance to apply or submit yet.
Quoted 6 lines
Frank, any chance you can submit. It's in my patch inbox at the office and I won't be back until the 3rd.
Thanks
Liam
I am out of the office until the 2nd, but I should be able to submit from home.
Are you referring to the patch I sent you last week, or Raúl's patch, or both?
(Raúl: thanks for the fixes to at91-i2s.c. I can't believe I was that careless!)
../fam
Signature · 13 lines
Frank Mandarino fmandarino(a)endrelia.com Endrelia Technologies Inc. Toronto, Ontario, Canada ------------------------------------------------------------------------- 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 _______________________________________________ Alsa-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/alsa-devel
Quoted 7 lines · Frank Mandarino
Quoted 5 lines · Liam Girdwood
Frank, any chance you can submit. It's in my patch inbox at the office and I won't be back until the 3rd.
Thanks
Quoted 7 lines
Quoted 1 line
Liam
I am out of the office until the 2nd, but I should be able to submit from home.
Are you referring to the patch I sent you last week, or Raúl's patch, or both?
Sorry, I was meaning your patch from last week.
Cheers
Liam
-------------------------------------------------------------------------
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
_______________________________________________
Alsa-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/alsa-devel
Quoted 12 lines · Liam Girdwood
Quoted 11 lines · Frank Mandarino
Quoted 6 lines · Liam Girdwood
Frank, any chance you can submit. It's in my patch inbox at the office and I won't be back until the 3rd.
Thanks
Liam
I am out of the office until the 2nd, but I should be able to submit from home.
Quoted 8 lines
Quoted 2 lines
Are you referring to the patch I sent you last week, or Raúl's patch, or both?
Sorry, I was meaning your patch from last week.
Cheers
Liam
No problem. I'll try to get it done today.
Regards,
../fam
Signature · 13 lines
Frank Mandarino fmandarino(a)endrelia.com Endrelia Technologies Inc. Toronto, Ontario, Canada ------------------------------------------------------------------------- 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 _______________________________________________ Alsa-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/alsa-devel
Quoted 7 lines · Liam Girdwood
Quoted 6 lines · Raúl Sánchez Siles
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.
Quoted 5 lines
Quoted 3 lines
I attach a patch to correct this problems. I'm new sending patches to alsa,
so if you think I did something wrong just let me know and I'll do my best.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
soc/soc-dapm.c +0 -1
@@ -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);
-------------------------------------------------------------------------
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
_______________________________________________
Alsa-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/alsa-devel
Quoted 10 lines · Liam Girdwood
Quoted 9 lines · Liam Girdwood
Quoted 7 lines · Raúl Sánchez Siles
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.
Quoted 8 lines
Quoted 1 line
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,
Signature · 1 line
Raúl Sánchez Siles
# HG changeset patch
# User Raúl Sánchez Siles <[email protected]>
# 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.
soc/at91/at91-i2s.c +19 -19
@@ -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 ; }
soc/soc-dapm.c +0 -1
@@ -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);
-------------------------------------------------------------------------
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
_______________________________________________
Alsa-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/alsa-devel
Quoted 17 lines · Raúl Sánchez Siles
Quoted 15 lines · Liam Girdwood
Quoted 10 lines · Liam Girdwood
Quoted 7 lines · Raúl Sánchez Siles
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 ?
Quoted 7 lines
Quoted 3 lines
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.
Thanks - The DAPM list_entry() fix that I attached in my last message was submitted by Seth in an earlier email to me.
Fwiw, I've added you to the sign off list. (It's common practice to sign patches as your own work before submitting to the kernel.)
Liam
-------------------------------------------------------------------------
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
_______________________________________________
Alsa-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/alsa-devel
Takashi Iwai
AppliedAt Fri, 05 Jan 2007 12:41:53 +0100,
Quoted 18 lines · Raúl Sánchez Siles
Quoted 15 lines · Liam Girdwood
Quoted 10 lines · Liam Girdwood
Quoted 7 lines · Raúl Sánchez Siles
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 ?
Quoted 6 lines
Quoted 3 lines
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.
Thanks, applied to ALSA HG tree now.
At the next time, don't forget give your sign-off, too.
Takashi
-------------------------------------------------------------------------
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
Quoted 9 lines · Raúl Sánchez Siles
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.I attach a patch to correct this problems. I'm new sending patches to alsa,
so if you think I did something wrong just let me know and I'll do my best.
I think that the line you modified in soc-dapm.c can be removed completely, since the loop is list_for_each_entry() and not list_for_each(). The assignment to p in the loop is redundant.
Cheers,
Seth
-------------------------------------------------------------------------
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