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

Takashi Iwai tiwai at suse.de
Thu May 8 15:40:55 CEST 2008


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 at 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
> 


More information about the Alsa-devel mailing list