diff options
author | Raúl Sánchez Siles <rss@barracuda.es> | 2007-01-08 04:56:48 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2007-02-09 03:02:52 -0500 |
commit | 751e61c47d3b4e929c93bac61c8dd6c247854993 (patch) | |
tree | dd182056ad25ae2d6ac3293e9e3e71d480fc8037 /sound/soc/at91 | |
parent | 0e4ceb7507111c3910a0d7e19b498b1f6081afcb (diff) |
[ALSA] 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.
Signed-off-by: Raúl Sánchez Siles <rss@barracuda.es>
Signed-off-by: Seth Forshee <seth.forshee@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/soc/at91')
-rw-r--r-- | sound/soc/at91/at91-i2s.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/sound/soc/at91/at91-i2s.c b/sound/soc/at91/at91-i2s.c index b452e8e6a724..203e6948cd99 100644 --- a/sound/soc/at91/at91-i2s.c +++ b/sound/soc/at91/at91-i2s.c | |||
@@ -101,7 +101,7 @@ static struct snd_soc_dai_mode at91_i2s[] = { | |||
101 | .pcmdir = AT91_I2S_DIR, | 101 | .pcmdir = AT91_I2S_DIR, |
102 | .flags = SND_SOC_DAI_BFS_DIV, | 102 | .flags = SND_SOC_DAI_BFS_DIV, |
103 | .fs = 250, | 103 | .fs = 250, |
104 | .bfs SND_SOC_FSBD(5), | 104 | .bfs = SND_SOC_FSBD(5), |
105 | .priv = (13 << 16 | 23), | 105 | .priv = (13 << 16 | 23), |
106 | }, | 106 | }, |
107 | }; | 107 | }; |
@@ -352,19 +352,19 @@ static int at91_i2s_suspend(struct platform_device *pdev, | |||
352 | ssc_p = &ssc_info[dai->id]; | 352 | ssc_p = &ssc_info[dai->id]; |
353 | 353 | ||
354 | /* Save the status register before disabling transmit and receive. */ | 354 | /* Save the status register before disabling transmit and receive. */ |
355 | ssc_p->state->ssc_sr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_SR); | 355 | ssc_p->ssc_state.ssc_sr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_SR); |
356 | at91_ssc_write(ssc_p->ssc.base + | 356 | at91_ssc_write(ssc_p->ssc.base + |
357 | AT91_SSC_CR, AT91_SSC_TXDIS | AT91_SSC_RXDIS); | 357 | AT91_SSC_CR, AT91_SSC_TXDIS | AT91_SSC_RXDIS); |
358 | 358 | ||
359 | /* Save the current interrupt mask, then disable unmasked interrupts. */ | 359 | /* Save the current interrupt mask, then disable unmasked interrupts. */ |
360 | ssc_p->state->ssc_imr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_IMR); | 360 | ssc_p->ssc_state.ssc_imr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_IMR); |
361 | at91_ssc_write(ssc_p->ssc.base + AT91_SSC_IDR, ssc_p->state->ssc_imr); | 361 | at91_ssc_write(ssc_p->ssc.base + AT91_SSC_IDR, ssc_p->ssc_state.ssc_imr); |
362 | 362 | ||
363 | ssc_p->state->ssc_cmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_CMR); | 363 | ssc_p->ssc_state.ssc_cmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_CMR); |
364 | ssc_p->state->ssc_rcmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR); | 364 | ssc_p->ssc_state.ssc_rcmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR); |
365 | ssc_p->state->ssc_rfmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR); | 365 | ssc_p->ssc_state.ssc_rfmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR); |
366 | ssc_p->state->ssc_tcmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR); | 366 | ssc_p->ssc_state.ssc_tcmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR); |
367 | ssc_p->state->ssc_tfmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR); | 367 | ssc_p->ssc_state.ssc_tfmr = at91_ssc_read(ssc_p->ssc.base + AT91_SSC_RCMR); |
368 | 368 | ||
369 | return 0; | 369 | return 0; |
370 | } | 370 | } |
@@ -380,17 +380,17 @@ static int at91_i2s_resume(struct platform_device *pdev, | |||
380 | 380 | ||
381 | ssc_p = &ssc_info[dai->id]; | 381 | ssc_p = &ssc_info[dai->id]; |
382 | 382 | ||
383 | at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->state->ssc_tfmr); | 383 | at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->ssc_state.ssc_tfmr); |
384 | at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->state->ssc_tcmr); | 384 | at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->ssc_state.ssc_tcmr); |
385 | at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->state->ssc_rfmr); | 385 | at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->ssc_state.ssc_rfmr); |
386 | at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->state->ssc_rcmr); | 386 | at91_ssc_write(ssc_p->ssc.base + AT91_SSC_RCMR, ssc_p->ssc_state.ssc_rcmr); |
387 | at91_ssc_write(ssc_p->ssc.base + AT91_SSC_CMR, ssc_p->state->ssc_cmr); | 387 | at91_ssc_write(ssc_p->ssc.base + AT91_SSC_CMR, ssc_p->ssc_state.ssc_cmr); |
388 | 388 | ||
389 | at91_ssc_write(ssc_p->ssc.base + AT91_SSC_IER, ssc_p->state->ssc_imr); | 389 | at91_ssc_write(ssc_p->ssc.base + AT91_SSC_IER, ssc_p->ssc_state.ssc_imr); |
390 | 390 | ||
391 | at91_ssc_write(ssc_p->ssc.base + AT91_SSC_CR, | 391 | at91_ssc_write(ssc_p->ssc.base + AT91_SSC_CR, |
392 | ((ssc_p->state->ssc_sr & AT91_SSC_RXENA) ? AT91_SSC_RXEN : 0) | | 392 | ((ssc_p->ssc_state.ssc_sr & AT91_SSC_RXENA) ? AT91_SSC_RXEN : 0) | |
393 | ((ssc_p->state->ssc_sr & AT91_SSC_TXENA) ? AT91_SSC_TXEN : 0)); | 393 | ((ssc_p->ssc_state.ssc_sr & AT91_SSC_TXENA) ? AT91_SSC_TXEN : 0)); |
394 | 394 | ||
395 | return 0; | 395 | return 0; |
396 | } | 396 | } |