Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8825e8e8 authored by Marc Zyngier's avatar Marc Zyngier Committed by Takashi Iwai
Browse files

ALSA: Fix pxa2xx-ac97-lib.c compilation 



The last ALSA merge broke pxa2xx-ac97-lib.c, as it brought back
references to cpu_is_pxa21x that Eric Miao removed in commit
0ffcbfd5:

	[ARM] pxa: make cpu_is_pxa2* macros more consistent

This patch gets rid of those references, and only keeps cpu_is_pxa25x().

Signed-off-by: default avatarMarc Zyngier <maz@misterjones.org>
Acked-by: default avatarEric Miao <eric.miao@marvell.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 7dc85076

sound/arm/pxa2xx-ac97-lib.c

+6 −6
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ unsigned short pxa2xx_ac97_read(struct snd_ac97 *ac97, unsigned short reg) 
	mutex_lock(&car_mutex);



	/* set up primary or secondary codec space */

	if ((cpu_is_pxa21x() || cpu_is_pxa25x()) && reg == AC97_GPIO_STATUS)

	if (cpu_is_pxa25x() && reg == AC97_GPIO_STATUS)

		reg_addr = ac97->num ? &SMC_REG_BASE : &PMC_REG_BASE;

	else

		reg_addr = ac97->num ? &SAC_REG_BASE : &PAC_REG_BASE;
@@ -90,7 +90,7 @@ void pxa2xx_ac97_write(struct snd_ac97 *ac97, unsigned short reg, 
	mutex_lock(&car_mutex);



	/* set up primary or secondary codec space */

	if ((cpu_is_pxa21x() || cpu_is_pxa25x()) && reg == AC97_GPIO_STATUS)

	if (cpu_is_pxa25x() && reg == AC97_GPIO_STATUS)

		reg_addr = ac97->num ? &SMC_REG_BASE : &PMC_REG_BASE;

	else

		reg_addr = ac97->num ? &SAC_REG_BASE : &PAC_REG_BASE;
@@ -200,7 +200,7 @@ static inline void pxa_ac97_cold_pxa3xx(void) 
bool pxa2xx_ac97_try_warm_reset(struct snd_ac97 *ac97)

{

#ifdef CONFIG_PXA25x

	if (cpu_is_pxa21x() || cpu_is_pxa25x())

	if (cpu_is_pxa25x())

		pxa_ac97_warm_pxa25x();

	else

#endif
@@ -230,7 +230,7 @@ EXPORT_SYMBOL_GPL(pxa2xx_ac97_try_warm_reset); 
bool pxa2xx_ac97_try_cold_reset(struct snd_ac97 *ac97)

{

#ifdef CONFIG_PXA25x

	if (cpu_is_pxa21x() || cpu_is_pxa25x())

	if (cpu_is_pxa25x())

		pxa_ac97_cold_pxa25x();

	else

#endif
@@ -301,7 +301,7 @@ EXPORT_SYMBOL_GPL(pxa2xx_ac97_hw_suspend); 


int pxa2xx_ac97_hw_resume(void)

{

	if (cpu_is_pxa21x() || cpu_is_pxa25x() || cpu_is_pxa27x()) {

	if (cpu_is_pxa25x() || cpu_is_pxa27x()) {

		pxa_gpio_mode(GPIO31_SYNC_AC97_MD);

		pxa_gpio_mode(GPIO30_SDATA_OUT_AC97_MD);

		pxa_gpio_mode(GPIO28_BITCLK_AC97_MD);
@@ -325,7 +325,7 @@ int __devinit pxa2xx_ac97_hw_probe(struct platform_device *dev) 
	if (ret < 0)

		goto err;



	if (cpu_is_pxa21x() || cpu_is_pxa25x() || cpu_is_pxa27x()) {

	if (cpu_is_pxa25x() || cpu_is_pxa27x()) {

		pxa_gpio_mode(GPIO31_SYNC_AC97_MD);

		pxa_gpio_mode(GPIO30_SDATA_OUT_AC97_MD);

		pxa_gpio_mode(GPIO28_BITCLK_AC97_MD);