3 files changed, 14 insertions, 14 deletions

diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c
index 28db4be7a16f..19c65a8d86a7 100644
--- a/sound/arm/pxa2xx-ac97.c
+++ b/sound/arm/pxa2xx-ac97.c
@@ -260,7 +260,7 @@ static int pxa2xx_ac97_do_suspend(struct snd_card *card, pm_message_t state)
         if (platform_ops && platform_ops->suspend)
                 platform_ops->suspend(platform_ops->priv);
         GCR |= GCR_ACLINK_OFF;
-        pxa_set_cken(CKEN2_AC97, 0);
+        pxa_set_cken(CKEN_AC97, 0);
 
         return 0;
 }
@@ -269,7 +269,7 @@ static int pxa2xx_ac97_do_resume(struct snd_card *card)
 {
         pxa2xx_audio_ops_t *platform_ops = card->dev->platform_data;
 
-        pxa_set_cken(CKEN2_AC97, 1);
+        pxa_set_cken(CKEN_AC97, 1);
         if (platform_ops && platform_ops->resume)
                 platform_ops->resume(platform_ops->priv);
         snd_ac97_resume(pxa2xx_ac97_ac97);
@@ -337,7 +337,7 @@ static int __devinit pxa2xx_ac97_probe(struct platform_device *dev)
         /* Use GPIO 113 as AC97 Reset on Bulverde */
         pxa_gpio_mode(113 | GPIO_ALT_FN_2_OUT);
 #endif
-        pxa_set_cken(CKEN2_AC97, 1);
+        pxa_set_cken(CKEN_AC97, 1);
 
         ret = snd_ac97_bus(card, 0, &pxa2xx_ac97_ops, NULL, &ac97_bus);
         if (ret)
@@ -361,10 +361,10 @@ static int __devinit pxa2xx_ac97_probe(struct platform_device *dev)
  err:
         if (card)
                 snd_card_free(card);
-        if (CKEN & CKEN2_AC97) {
+        if (CKEN & CKEN_AC97) {
                 GCR |= GCR_ACLINK_OFF;
                 free_irq(IRQ_AC97, NULL);
-                pxa_set_cken(CKEN2_AC97, 0);
+                pxa_set_cken(CKEN_AC97, 0);
         }
         return ret;
 }
@@ -378,7 +378,7 @@ static int __devexit pxa2xx_ac97_remove(struct platform_device *dev)
                 platform_set_drvdata(dev, NULL);
                 GCR |= GCR_ACLINK_OFF;
                 free_irq(IRQ_AC97, NULL);
-                pxa_set_cken(CKEN2_AC97, 0);
+                pxa_set_cken(CKEN_AC97, 0);
         }
 
         return 0;
diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c
index 1bbbeff84ef0..b222755763e7 100644
--- a/sound/soc/pxa/pxa2xx-ac97.c
+++ b/sound/soc/pxa/pxa2xx-ac97.c
@@ -256,7 +256,7 @@ static int pxa2xx_ac97_suspend(struct platform_device *pdev,
         struct snd_soc_cpu_dai *dai)
 {
         GCR |= GCR_ACLINK_OFF;
-        pxa_set_cken(CKEN2_AC97, 0);
+        pxa_set_cken(CKEN_AC97, 0);
         return 0;
 }
 
@@ -271,7 +271,7 @@ static int pxa2xx_ac97_resume(struct platform_device *pdev,
         /* Use GPIO 113 as AC97 Reset on Bulverde */
         pxa_gpio_mode(113 | GPIO_ALT_FN_2_OUT);
 #endif
-        pxa_set_cken(CKEN2_AC97, 1);
+        pxa_set_cken(CKEN_AC97, 1);
         return 0;
 }
 
@@ -296,14 +296,14 @@ static int pxa2xx_ac97_probe(struct platform_device *pdev)
         /* Use GPIO 113 as AC97 Reset on Bulverde */
         pxa_gpio_mode(113 | GPIO_ALT_FN_2_OUT);
 #endif
-        pxa_set_cken(CKEN2_AC97, 1);
+        pxa_set_cken(CKEN_AC97, 1);
         return 0;
 
  err:
-        if (CKEN & CKEN2_AC97) {
+        if (CKEN & CKEN_AC97) {
                 GCR |= GCR_ACLINK_OFF;
                 free_irq(IRQ_AC97, NULL);
-                pxa_set_cken(CKEN2_AC97, 0);
+                pxa_set_cken(CKEN_AC97, 0);
         }
         return ret;
 }
@@ -312,7 +312,7 @@ static void pxa2xx_ac97_remove(struct platform_device *pdev)
 {
         GCR |= GCR_ACLINK_OFF;
         free_irq(IRQ_AC97, NULL);
-        pxa_set_cken(CKEN2_AC97, 0);
+        pxa_set_cken(CKEN_AC97, 0);
 }
 
 static int pxa2xx_ac97_hw_params(struct snd_pcm_substream *substream,
diff --git a/sound/soc/pxa/pxa2xx-i2s.c b/sound/soc/pxa/pxa2xx-i2s.c
index 575a6137c040..50c5c83f67db 100644
--- a/sound/soc/pxa/pxa2xx-i2s.c
+++ b/sound/soc/pxa/pxa2xx-i2s.c
@@ -149,7 +149,7 @@ static int pxa2xx_i2s_hw_params(struct snd_pcm_substream *substream,
         pxa_gpio_mode(gpio_bus[pxa_i2s.master].tx);
         pxa_gpio_mode(gpio_bus[pxa_i2s.master].frm);
         pxa_gpio_mode(gpio_bus[pxa_i2s.master].clk);
-        pxa_set_cken(CKEN8_I2S, 1);
+        pxa_set_cken(CKEN_I2S, 1);
         pxa_i2s_wait();
 
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
@@ -234,7 +234,7 @@ static void pxa2xx_i2s_shutdown(struct snd_pcm_substream *substream)
         if (SACR1 & (SACR1_DREC | SACR1_DRPL)) {
                 SACR0 &= ~SACR0_ENB;
                 pxa_i2s_wait();
-                pxa_set_cken(CKEN8_I2S, 0);
+                pxa_set_cken(CKEN_I2S, 0);
         }
 }