[PATCH 1/2] soc - at91-pcm - Fix line wrapping

[PATCH 1/2] soc - at91-pcm - Fix line wrapping

[Mark Brown]

There's more checkpatch stuff to fix in the driver, this just fixes the
minimum required for the following patch to be clean.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
 sound/soc/at91/at91-pcm.c |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/sound/soc/at91/at91-pcm.c b/sound/soc/at91/at91-pcm.c
index 67c88e3..e36533d 100644
--- a/sound/soc/at91/at91-pcm.c
+++ b/sound/soc/at91/at91-pcm.c
@@ -103,7 +103,8 @@ static void at91_pcm_dma_irq(u32 ssc_sr,
 		if (prtd->period_ptr >= prtd->dma_buffer_end) {
 			prtd->period_ptr = prtd->dma_buffer;
 		}
-		at91_ssc_write(params->ssc_base + params->pdc->xnpr, prtd->period_ptr);
+		at91_ssc_write(params->ssc_base + params->pdc->xnpr,
+			       prtd->period_ptr);
 		at91_ssc_write(params->ssc_base + params->pdc->xncr,
 				prtd->period_size / params->pdc_xfer_size);
 	}
@@ -191,10 +192,12 @@ static int at91_pcm_trigger(struct snd_pcm_substream *substream,
 		at91_ssc_write(params->ssc_base + AT91_SSC_IER,
 			params->mask->ssc_endx | params->mask->ssc_endbuf);
 
-		at91_ssc_write(params->ssc_base + ATMEL_PDC_PTCR, params->mask->pdc_enable);
+		at91_ssc_write(params->ssc_base + ATMEL_PDC_PTCR,
+			params->mask->pdc_enable);
 
-		DBG("sr=%lx imr=%lx\n", at91_ssc_read(params->ssc_base + AT91_SSC_SR),
-					at91_ssc_read(params->ssc_base + AT91_SSC_IER));
+		DBG("sr=%lx imr=%lx\n",
+		    at91_ssc_read(params->ssc_base + AT91_SSC_SR),
+		    at91_ssc_read(params->ssc_base + AT91_SSC_IER));
 		break;
 
 	case SNDRV_PCM_TRIGGER_STOP:
-- 
1.5.5.1

[PATCH 2/2] soc at91 minor bug fixes

[Mark Brown]

From: Patrik Sevallius <patrik.sevallius@enea.com>

Found these two bugs while browsing through the code.  The first one is
a cut-n-paste bug, instead of disabling the clock when request_irq()
fails, it enabled it once more.  The second one fixes a debug printout,
AT91_SSC_IER is write only, AT91_SSC_IMR is readable (the printed string
actually says imr).

Frank Mandarino was busy so he asked me to send these to this list.

/Patrik

Signed-off-by: Patrik Sevallius <patrik.sevallius@enea.com>
Acked-by: Frank Mandarino <fmandarino@endrelia.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
 sound/soc/at91/at91-pcm.c |    2 +-
 sound/soc/at91/at91-ssc.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/at91/at91-pcm.c b/sound/soc/at91/at91-pcm.c
index e36533d..ccac6bd 100644
--- a/sound/soc/at91/at91-pcm.c
+++ b/sound/soc/at91/at91-pcm.c
@@ -197,7 +197,7 @@ static int at91_pcm_trigger(struct snd_pcm_substream *substream,
 
 		DBG("sr=%lx imr=%lx\n",
 		    at91_ssc_read(params->ssc_base + AT91_SSC_SR),
-		    at91_ssc_read(params->ssc_base + AT91_SSC_IER));
+		    at91_ssc_read(params->ssc_base + AT91_SSC_IMR));
 		break;
 
 	case SNDRV_PCM_TRIGGER_STOP:
diff --git a/sound/soc/at91/at91-ssc.c b/sound/soc/at91/at91-ssc.c
index f642d2d..bc35d00 100644
--- a/sound/soc/at91/at91-ssc.c
+++ b/sound/soc/at91/at91-ssc.c
@@ -590,7 +590,7 @@ static int at91_ssc_hw_params(struct snd_pcm_substream *substream,
 			printk(KERN_WARNING "at91-ssc: request_irq failure\n");
 
 			DBG("Stopping pid %d clock\n", ssc_p->ssc.pid);
-			at91_sys_write(AT91_PMC_PCER, 1<<ssc_p->ssc.pid);
+			at91_sys_write(AT91_PMC_PCDR, 1<<ssc_p->ssc.pid);
 			return ret;
 		}
 
-- 
1.5.5.1

Re: [PATCH 1/2] soc - at91-pcm - Fix line wrapping

[Takashi Iwai]

At Thu,  8 May 2008 11:27:54 +0100,
Mark Brown wrote:
> 
> There's more checkpatch stuff to fix in the driver, this just fixes the
> minimum required for the following patch to be clean.
> 
> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
> ---
>  sound/soc/at91/at91-pcm.c |   11 +++++++----
>  1 files changed, 7 insertions(+), 4 deletions(-)

Thanks, both applied to ALSA tree.


Takashi

> diff --git a/sound/soc/at91/at91-pcm.c b/sound/soc/at91/at91-pcm.c
> index 67c88e3..e36533d 100644
> --- a/sound/soc/at91/at91-pcm.c
> +++ b/sound/soc/at91/at91-pcm.c
> @@ -103,7 +103,8 @@ static void at91_pcm_dma_irq(u32 ssc_sr,
>  		if (prtd->period_ptr >= prtd->dma_buffer_end) {
>  			prtd->period_ptr = prtd->dma_buffer;
>  		}
> -		at91_ssc_write(params->ssc_base + params->pdc->xnpr, prtd->period_ptr);
> +		at91_ssc_write(params->ssc_base + params->pdc->xnpr,
> +			       prtd->period_ptr);
>  		at91_ssc_write(params->ssc_base + params->pdc->xncr,
>  				prtd->period_size / params->pdc_xfer_size);
>  	}
> @@ -191,10 +192,12 @@ static int at91_pcm_trigger(struct snd_pcm_substream *substream,
>  		at91_ssc_write(params->ssc_base + AT91_SSC_IER,
>  			params->mask->ssc_endx | params->mask->ssc_endbuf);
>  
> -		at91_ssc_write(params->ssc_base + ATMEL_PDC_PTCR, params->mask->pdc_enable);
> +		at91_ssc_write(params->ssc_base + ATMEL_PDC_PTCR,
> +			params->mask->pdc_enable);
>  
> -		DBG("sr=%lx imr=%lx\n", at91_ssc_read(params->ssc_base + AT91_SSC_SR),
> -					at91_ssc_read(params->ssc_base + AT91_SSC_IER));
> +		DBG("sr=%lx imr=%lx\n",
> +		    at91_ssc_read(params->ssc_base + AT91_SSC_SR),
> +		    at91_ssc_read(params->ssc_base + AT91_SSC_IER));
>  		break;
>  
>  	case SNDRV_PCM_TRIGGER_STOP:
> -- 
> 1.5.5.1
>