diff options
Diffstat (limited to 'sound/arm/pxa2xx-ac97.c')
-rw-r--r-- | sound/arm/pxa2xx-ac97.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c index 8704e2825b10..490729799e59 100644 --- a/sound/arm/pxa2xx-ac97.c +++ b/sound/arm/pxa2xx-ac97.c | |||
@@ -72,7 +72,7 @@ static unsigned short pxa2xx_ac97_read(struct snd_ac97 *ac97, unsigned short reg | |||
72 | if (wait_event_timeout(gsr_wq, (GSR | gsr_bits) & GSR_SDONE, 1) <= 0 && | 72 | if (wait_event_timeout(gsr_wq, (GSR | gsr_bits) & GSR_SDONE, 1) <= 0 && |
73 | !((GSR | gsr_bits) & GSR_SDONE)) { | 73 | !((GSR | gsr_bits) & GSR_SDONE)) { |
74 | printk(KERN_ERR "%s: read error (ac97_reg=%d GSR=%#lx)\n", | 74 | printk(KERN_ERR "%s: read error (ac97_reg=%d GSR=%#lx)\n", |
75 | __FUNCTION__, reg, GSR | gsr_bits); | 75 | __func__, reg, GSR | gsr_bits); |
76 | val = -1; | 76 | val = -1; |
77 | goto out; | 77 | goto out; |
78 | } | 78 | } |
@@ -104,7 +104,7 @@ static void pxa2xx_ac97_write(struct snd_ac97 *ac97, unsigned short reg, unsigne | |||
104 | if (wait_event_timeout(gsr_wq, (GSR | gsr_bits) & GSR_CDONE, 1) <= 0 && | 104 | if (wait_event_timeout(gsr_wq, (GSR | gsr_bits) & GSR_CDONE, 1) <= 0 && |
105 | !((GSR | gsr_bits) & GSR_CDONE)) | 105 | !((GSR | gsr_bits) & GSR_CDONE)) |
106 | printk(KERN_ERR "%s: write error (ac97_reg=%d GSR=%#lx)\n", | 106 | printk(KERN_ERR "%s: write error (ac97_reg=%d GSR=%#lx)\n", |
107 | __FUNCTION__, reg, GSR | gsr_bits); | 107 | __func__, reg, GSR | gsr_bits); |
108 | 108 | ||
109 | mutex_unlock(&car_mutex); | 109 | mutex_unlock(&car_mutex); |
110 | } | 110 | } |
@@ -131,7 +131,7 @@ static void pxa2xx_ac97_reset(struct snd_ac97 *ac97) | |||
131 | 131 | ||
132 | if (!((GSR | gsr_bits) & (GSR_PCR | GSR_SCR))) { | 132 | if (!((GSR | gsr_bits) & (GSR_PCR | GSR_SCR))) { |
133 | printk(KERN_INFO "%s: cold reset timeout (GSR=%#lx)\n", | 133 | printk(KERN_INFO "%s: cold reset timeout (GSR=%#lx)\n", |
134 | __FUNCTION__, gsr_bits); | 134 | __func__, gsr_bits); |
135 | 135 | ||
136 | /* let's try warm reset */ | 136 | /* let's try warm reset */ |
137 | gsr_bits = 0; | 137 | gsr_bits = 0; |
@@ -150,7 +150,7 @@ static void pxa2xx_ac97_reset(struct snd_ac97 *ac97) | |||
150 | 150 | ||
151 | if (!((GSR | gsr_bits) & (GSR_PCR | GSR_SCR))) | 151 | if (!((GSR | gsr_bits) & (GSR_PCR | GSR_SCR))) |
152 | printk(KERN_INFO "%s: warm reset timeout (GSR=%#lx)\n", | 152 | printk(KERN_INFO "%s: warm reset timeout (GSR=%#lx)\n", |
153 | __FUNCTION__, gsr_bits); | 153 | __func__, gsr_bits); |
154 | } | 154 | } |
155 | 155 | ||
156 | GCR &= ~(GCR_PRIRDY_IEN|GCR_SECRDY_IEN); | 156 | GCR &= ~(GCR_PRIRDY_IEN|GCR_SECRDY_IEN); |