aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/pxa/pxa2xx-ac97.c
diff options
context:
space:
mode:
Diffstat (limited to 'sound/soc/pxa/pxa2xx-ac97.c')
-rw-r--r--sound/soc/pxa/pxa2xx-ac97.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c
index e17379998802..1092d58e8523 100644
--- a/sound/soc/pxa/pxa2xx-ac97.c
+++ b/sound/soc/pxa/pxa2xx-ac97.c
@@ -87,7 +87,7 @@ static unsigned short pxa2xx_ac97_read(struct snd_ac97 *ac97,
87 wait_event_timeout(gsr_wq, (GSR | gsr_bits) & GSR_SDONE, 1); 87 wait_event_timeout(gsr_wq, (GSR | gsr_bits) & GSR_SDONE, 1);
88 if (!((GSR | gsr_bits) & GSR_SDONE)) { 88 if (!((GSR | gsr_bits) & GSR_SDONE)) {
89 printk(KERN_ERR "%s: read error (ac97_reg=%x GSR=%#lx)\n", 89 printk(KERN_ERR "%s: read error (ac97_reg=%x GSR=%#lx)\n",
90 __FUNCTION__, reg, GSR | gsr_bits); 90 __func__, reg, GSR | gsr_bits);
91 val = -1; 91 val = -1;
92 goto out; 92 goto out;
93 } 93 }
@@ -127,7 +127,7 @@ static void pxa2xx_ac97_write(struct snd_ac97 *ac97, unsigned short reg,
127 wait_event_timeout(gsr_wq, (GSR | gsr_bits) & GSR_CDONE, 1); 127 wait_event_timeout(gsr_wq, (GSR | gsr_bits) & GSR_CDONE, 1);
128 if (!((GSR | gsr_bits) & GSR_CDONE)) 128 if (!((GSR | gsr_bits) & GSR_CDONE))
129 printk(KERN_ERR "%s: write error (ac97_reg=%x GSR=%#lx)\n", 129 printk(KERN_ERR "%s: write error (ac97_reg=%x GSR=%#lx)\n",
130 __FUNCTION__, reg, GSR | gsr_bits); 130 __func__, reg, GSR | gsr_bits);
131 131
132 mutex_unlock(&car_mutex); 132 mutex_unlock(&car_mutex);
133} 133}
@@ -151,7 +151,7 @@ static void pxa2xx_ac97_warm_reset(struct snd_ac97 *ac97)
151 151
152 if (!((GSR | gsr_bits) & (GSR_PCR | GSR_SCR))) 152 if (!((GSR | gsr_bits) & (GSR_PCR | GSR_SCR)))
153 printk(KERN_INFO "%s: warm reset timeout (GSR=%#lx)\n", 153 printk(KERN_INFO "%s: warm reset timeout (GSR=%#lx)\n",
154 __FUNCTION__, gsr_bits); 154 __func__, gsr_bits);
155 155
156 GCR &= ~(GCR_PRIRDY_IEN|GCR_SECRDY_IEN); 156 GCR &= ~(GCR_PRIRDY_IEN|GCR_SECRDY_IEN);
157 GCR |= GCR_SDONE_IE|GCR_CDONE_IE; 157 GCR |= GCR_SDONE_IE|GCR_CDONE_IE;
@@ -178,7 +178,7 @@ static void pxa2xx_ac97_cold_reset(struct snd_ac97 *ac97)
178 178
179 if (!((GSR | gsr_bits) & (GSR_PCR | GSR_SCR))) 179 if (!((GSR | gsr_bits) & (GSR_PCR | GSR_SCR)))
180 printk(KERN_INFO "%s: cold reset timeout (GSR=%#lx)\n", 180 printk(KERN_INFO "%s: cold reset timeout (GSR=%#lx)\n",
181 __FUNCTION__, gsr_bits); 181 __func__, gsr_bits);
182 182
183 GCR &= ~(GCR_PRIRDY_IEN|GCR_SECRDY_IEN); 183 GCR &= ~(GCR_PRIRDY_IEN|GCR_SECRDY_IEN);
184 GCR |= GCR_SDONE_IE|GCR_CDONE_IE; 184 GCR |= GCR_SDONE_IE|GCR_CDONE_IE;