diff options
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/ad1889.c | 4 | ||||
-rw-r--r-- | sound/pci/als300.c | 4 | ||||
-rw-r--r-- | sound/pci/azt3328.c | 4 | ||||
-rw-r--r-- | sound/pci/intel8x0.c | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/sound/pci/ad1889.c b/sound/pci/ad1889.c index a66d5150bb7a..1edb6448946d 100644 --- a/sound/pci/ad1889.c +++ b/sound/pci/ad1889.c | |||
@@ -264,10 +264,10 @@ snd_ad1889_ac97_ready(struct snd_ad1889 *chip) | |||
264 | mdelay(1); | 264 | mdelay(1); |
265 | if (!retry) { | 265 | if (!retry) { |
266 | snd_printk(KERN_ERR PFX "[%s] Link is not ready.\n", | 266 | snd_printk(KERN_ERR PFX "[%s] Link is not ready.\n", |
267 | __FUNCTION__); | 267 | __func__); |
268 | return -EIO; | 268 | return -EIO; |
269 | } | 269 | } |
270 | ad1889_debug("[%s] ready after %d ms\n", __FUNCTION__, 400 - retry); | 270 | ad1889_debug("[%s] ready after %d ms\n", __func__, 400 - retry); |
271 | 271 | ||
272 | return 0; | 272 | return 0; |
273 | } | 273 | } |
diff --git a/sound/pci/als300.c b/sound/pci/als300.c index 0e990a735821..8df6824b51cd 100644 --- a/sound/pci/als300.c +++ b/sound/pci/als300.c | |||
@@ -92,8 +92,8 @@ | |||
92 | 92 | ||
93 | #if DEBUG_CALLS | 93 | #if DEBUG_CALLS |
94 | #define snd_als300_dbgcalls(format, args...) printk(format, ##args) | 94 | #define snd_als300_dbgcalls(format, args...) printk(format, ##args) |
95 | #define snd_als300_dbgcallenter() printk(KERN_ERR "--> %s\n", __FUNCTION__) | 95 | #define snd_als300_dbgcallenter() printk(KERN_ERR "--> %s\n", __func__) |
96 | #define snd_als300_dbgcallleave() printk(KERN_ERR "<-- %s\n", __FUNCTION__) | 96 | #define snd_als300_dbgcallleave() printk(KERN_ERR "<-- %s\n", __func__) |
97 | #else | 97 | #else |
98 | #define snd_als300_dbgcalls(format, args...) | 98 | #define snd_als300_dbgcalls(format, args...) |
99 | #define snd_als300_dbgcallenter() | 99 | #define snd_als300_dbgcallenter() |
diff --git a/sound/pci/azt3328.c b/sound/pci/azt3328.c index 4e71a55120a0..be87d3113ee4 100644 --- a/sound/pci/azt3328.c +++ b/sound/pci/azt3328.c | |||
@@ -157,8 +157,8 @@ MODULE_SUPPORTED_DEVICE("{{Aztech,AZF3328}}"); | |||
157 | 157 | ||
158 | #if DEBUG_CALLS | 158 | #if DEBUG_CALLS |
159 | #define snd_azf3328_dbgcalls(format, args...) printk(format, ##args) | 159 | #define snd_azf3328_dbgcalls(format, args...) printk(format, ##args) |
160 | #define snd_azf3328_dbgcallenter() printk(KERN_ERR "--> %s\n", __FUNCTION__) | 160 | #define snd_azf3328_dbgcallenter() printk(KERN_ERR "--> %s\n", __func__) |
161 | #define snd_azf3328_dbgcallleave() printk(KERN_ERR "<-- %s\n", __FUNCTION__) | 161 | #define snd_azf3328_dbgcallleave() printk(KERN_ERR "<-- %s\n", __func__) |
162 | #else | 162 | #else |
163 | #define snd_azf3328_dbgcalls(format, args...) | 163 | #define snd_azf3328_dbgcalls(format, args...) |
164 | #define snd_azf3328_dbgcallenter() | 164 | #define snd_azf3328_dbgcallenter() |
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c index 07782ba9c74d..47485afcab5f 100644 --- a/sound/pci/intel8x0.c +++ b/sound/pci/intel8x0.c | |||
@@ -2670,7 +2670,7 @@ static void __devinit intel8x0_measure_ac97_clock(struct intel8x0 *chip) | |||
2670 | t = stop_time.tv_sec - start_time.tv_sec; | 2670 | t = stop_time.tv_sec - start_time.tv_sec; |
2671 | t *= 1000000; | 2671 | t *= 1000000; |
2672 | t += stop_time.tv_usec - start_time.tv_usec; | 2672 | t += stop_time.tv_usec - start_time.tv_usec; |
2673 | printk(KERN_INFO "%s: measured %lu usecs\n", __FUNCTION__, t); | 2673 | printk(KERN_INFO "%s: measured %lu usecs\n", __func__, t); |
2674 | if (t == 0) { | 2674 | if (t == 0) { |
2675 | snd_printk(KERN_ERR "?? calculation error..\n"); | 2675 | snd_printk(KERN_ERR "?? calculation error..\n"); |
2676 | return; | 2676 | return; |