[alsa-devel] [RFC PATCH 4/5] ASoC: remove those unnecessary #ifdef CONFIG_PXA3xx .. #endif

Daniel Mack daniel at caiaq.de
Thu Apr 23 09:08:15 CEST 2009


Hi Eric,

On Thu, Apr 23, 2009 at 01:06:55PM +0800, Eric Miao wrote:
> @@ -652,10 +643,8 @@ static int pxa_ssp_hw_params(struct
> snd_pcm_substream *substream,
>  	sscr0 = ssp_read_reg(ssp, SSCR0);
>  	switch (params_format(params)) {
>  	case SNDRV_PCM_FORMAT_S16_LE:
> -#ifdef CONFIG_PXA3xx
>  		if (cpu_is_pxa3xx())
>  			sscr0 |= SSCR0_FPCKE;
> -#endif
>  		sscr0 |= SSCR0_DataSize(16);
>  		break;
>  	case SNDRV_PCM_FORMAT_S24_LE:
> @@ -682,7 +671,6 @@ static int pxa_ssp_hw_params(struct
> snd_pcm_substream *substream,
>  			* needed for that mode are only available on PXA3xx.
>  			*/
> 
> -#ifdef CONFIG_PXA3xx
>  			if (!cpu_is_pxa3xx())
>  				return -EINVAL;
> 
> @@ -691,9 +679,6 @@ static int pxa_ssp_hw_params(struct
> snd_pcm_substream *substream,
>  			sspsp |= SSPSP_EDMYSTOP(3);
>  			sspsp |= SSPSP_DMYSTOP(3);
>  			sspsp |= SSPSP_DMYSTRT(1);

These macros are only defined for PXA3xx since the register bits are not
used on other PXAs. Hence, the usage of these macros must be conditional
as well. Was this ever compiled for PXA2xx?

Daniel



More information about the Alsa-devel mailing list