diff options
author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-03-03 18:32:18 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2008-04-24 06:00:20 -0400 |
commit | 9bf8e7ddeaf57f1ec534014c447705ad31d5d721 (patch) | |
tree | 6cb4dd4763631bf9f181ba30ffce6ebbfc70073b | |
parent | 24982c5f7feca2f4d1b0b562a28b767d93a01ce0 (diff) |
[ALSA] sound: replace remaining __FUNCTION__ occurences
__FUNCTION__ is gcc-specific, use __func__
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
-rw-r--r-- | sound/arm/pxa2xx-ac97.c | 8 | ||||
-rw-r--r-- | sound/core/init.c | 2 | ||||
-rw-r--r-- | sound/isa/sb/sb16_csp.c | 28 | ||||
-rw-r--r-- | sound/isa/sb/sb_common.c | 6 | ||||
-rw-r--r-- | sound/oss/trident.h | 2 | ||||
-rw-r--r-- | sound/oss/vwsnd.c | 6 | ||||
-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 | ||||
-rw-r--r-- | sound/soc/pxa/pxa2xx-ac97.c | 8 | ||||
-rw-r--r-- | sound/soc/s3c24xx/s3c24xx-i2s.c | 20 | ||||
-rw-r--r-- | sound/soc/s3c24xx/s3c24xx-pcm.c | 28 | ||||
-rw-r--r-- | sound/soc/soc-dapm.c | 2 |
14 files changed, 62 insertions, 62 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); |
diff --git a/sound/core/init.c b/sound/core/init.c index e3338d6071ef..f045f7db3ab4 100644 --- a/sound/core/init.c +++ b/sound/core/init.c | |||
@@ -254,7 +254,7 @@ static int snd_disconnect_release(struct inode *inode, struct file *file) | |||
254 | if (likely(df)) | 254 | if (likely(df)) |
255 | return df->disconnected_f_op->release(inode, file); | 255 | return df->disconnected_f_op->release(inode, file); |
256 | 256 | ||
257 | panic("%s(%p, %p) failed!", __FUNCTION__, inode, file); | 257 | panic("%s(%p, %p) failed!", __func__, inode, file); |
258 | } | 258 | } |
259 | 259 | ||
260 | static unsigned int snd_disconnect_poll(struct file * file, poll_table * wait) | 260 | static unsigned int snd_disconnect_poll(struct file * file, poll_table * wait) |
diff --git a/sound/isa/sb/sb16_csp.c b/sound/isa/sb/sb16_csp.c index bed29ca22239..f3fd7b4f4668 100644 --- a/sound/isa/sb/sb16_csp.c +++ b/sound/isa/sb/sb16_csp.c | |||
@@ -331,7 +331,7 @@ static int snd_sb_csp_riff_load(struct snd_sb_csp * p, | |||
331 | return -EFAULT; | 331 | return -EFAULT; |
332 | if ((file_h.name != RIFF_HEADER) || | 332 | if ((file_h.name != RIFF_HEADER) || |
333 | (le32_to_cpu(file_h.len) >= SNDRV_SB_CSP_MAX_MICROCODE_FILE_SIZE - sizeof(file_h))) { | 333 | (le32_to_cpu(file_h.len) >= SNDRV_SB_CSP_MAX_MICROCODE_FILE_SIZE - sizeof(file_h))) { |
334 | snd_printd("%s: Invalid RIFF header\n", __FUNCTION__); | 334 | snd_printd("%s: Invalid RIFF header\n", __func__); |
335 | return -EINVAL; | 335 | return -EINVAL; |
336 | } | 336 | } |
337 | data_ptr += sizeof(file_h); | 337 | data_ptr += sizeof(file_h); |
@@ -340,7 +340,7 @@ static int snd_sb_csp_riff_load(struct snd_sb_csp * p, | |||
340 | if (copy_from_user(&item_type, data_ptr, sizeof(item_type))) | 340 | if (copy_from_user(&item_type, data_ptr, sizeof(item_type))) |
341 | return -EFAULT; | 341 | return -EFAULT; |
342 | if (item_type != CSP__HEADER) { | 342 | if (item_type != CSP__HEADER) { |
343 | snd_printd("%s: Invalid RIFF file type\n", __FUNCTION__); | 343 | snd_printd("%s: Invalid RIFF file type\n", __func__); |
344 | return -EINVAL; | 344 | return -EINVAL; |
345 | } | 345 | } |
346 | data_ptr += sizeof (item_type); | 346 | data_ptr += sizeof (item_type); |
@@ -395,7 +395,7 @@ static int snd_sb_csp_riff_load(struct snd_sb_csp * p, | |||
395 | return -EFAULT; | 395 | return -EFAULT; |
396 | 396 | ||
397 | if (code_h.name != MAIN_HEADER) { | 397 | if (code_h.name != MAIN_HEADER) { |
398 | snd_printd("%s: Missing 'main' microcode\n", __FUNCTION__); | 398 | snd_printd("%s: Missing 'main' microcode\n", __func__); |
399 | return -EINVAL; | 399 | return -EINVAL; |
400 | } | 400 | } |
401 | data_ptr += sizeof(code_h); | 401 | data_ptr += sizeof(code_h); |
@@ -439,7 +439,7 @@ static int snd_sb_csp_riff_load(struct snd_sb_csp * p, | |||
439 | p->acc_format = p->acc_width = p->acc_rates = 0; | 439 | p->acc_format = p->acc_width = p->acc_rates = 0; |
440 | p->mode = 0; | 440 | p->mode = 0; |
441 | snd_printd("%s: Unsupported CSP codec type: 0x%04x\n", | 441 | snd_printd("%s: Unsupported CSP codec type: 0x%04x\n", |
442 | __FUNCTION__, | 442 | __func__, |
443 | le16_to_cpu(funcdesc_h.VOC_type)); | 443 | le16_to_cpu(funcdesc_h.VOC_type)); |
444 | return -EINVAL; | 444 | return -EINVAL; |
445 | } | 445 | } |
@@ -458,7 +458,7 @@ static int snd_sb_csp_riff_load(struct snd_sb_csp * p, | |||
458 | return 0; | 458 | return 0; |
459 | } | 459 | } |
460 | } | 460 | } |
461 | snd_printd("%s: Function #%d not found\n", __FUNCTION__, info.func_req); | 461 | snd_printd("%s: Function #%d not found\n", __func__, info.func_req); |
462 | return -EINVAL; | 462 | return -EINVAL; |
463 | } | 463 | } |
464 | 464 | ||
@@ -612,7 +612,7 @@ static int get_version(struct snd_sb *chip) | |||
612 | static int snd_sb_csp_check_version(struct snd_sb_csp * p) | 612 | static int snd_sb_csp_check_version(struct snd_sb_csp * p) |
613 | { | 613 | { |
614 | if (p->version < 0x10 || p->version > 0x1f) { | 614 | if (p->version < 0x10 || p->version > 0x1f) { |
615 | snd_printd("%s: Invalid CSP version: 0x%x\n", __FUNCTION__, p->version); | 615 | snd_printd("%s: Invalid CSP version: 0x%x\n", __func__, p->version); |
616 | return 1; | 616 | return 1; |
617 | } | 617 | } |
618 | return 0; | 618 | return 0; |
@@ -631,7 +631,7 @@ static int snd_sb_csp_load(struct snd_sb_csp * p, const unsigned char *buf, int | |||
631 | spin_lock_irqsave(&p->chip->reg_lock, flags); | 631 | spin_lock_irqsave(&p->chip->reg_lock, flags); |
632 | snd_sbdsp_command(p->chip, 0x01); /* CSP download command */ | 632 | snd_sbdsp_command(p->chip, 0x01); /* CSP download command */ |
633 | if (snd_sbdsp_get_byte(p->chip)) { | 633 | if (snd_sbdsp_get_byte(p->chip)) { |
634 | snd_printd("%s: Download command failed\n", __FUNCTION__); | 634 | snd_printd("%s: Download command failed\n", __func__); |
635 | goto __fail; | 635 | goto __fail; |
636 | } | 636 | } |
637 | /* Send CSP low byte (size - 1) */ | 637 | /* Send CSP low byte (size - 1) */ |
@@ -658,7 +658,7 @@ static int snd_sb_csp_load(struct snd_sb_csp * p, const unsigned char *buf, int | |||
658 | udelay (10); | 658 | udelay (10); |
659 | } | 659 | } |
660 | if (status != 0x55) { | 660 | if (status != 0x55) { |
661 | snd_printd("%s: Microcode initialization failed\n", __FUNCTION__); | 661 | snd_printd("%s: Microcode initialization failed\n", __func__); |
662 | goto __fail; | 662 | goto __fail; |
663 | } | 663 | } |
664 | } else { | 664 | } else { |
@@ -824,19 +824,19 @@ static int snd_sb_csp_start(struct snd_sb_csp * p, int sample_width, int channel | |||
824 | unsigned long flags; | 824 | unsigned long flags; |
825 | 825 | ||
826 | if (!(p->running & (SNDRV_SB_CSP_ST_LOADED | SNDRV_SB_CSP_ST_AUTO))) { | 826 | if (!(p->running & (SNDRV_SB_CSP_ST_LOADED | SNDRV_SB_CSP_ST_AUTO))) { |
827 | snd_printd("%s: Microcode not loaded\n", __FUNCTION__); | 827 | snd_printd("%s: Microcode not loaded\n", __func__); |
828 | return -ENXIO; | 828 | return -ENXIO; |
829 | } | 829 | } |
830 | if (p->running & SNDRV_SB_CSP_ST_RUNNING) { | 830 | if (p->running & SNDRV_SB_CSP_ST_RUNNING) { |
831 | snd_printd("%s: CSP already running\n", __FUNCTION__); | 831 | snd_printd("%s: CSP already running\n", __func__); |
832 | return -EBUSY; | 832 | return -EBUSY; |
833 | } | 833 | } |
834 | if (!(sample_width & p->acc_width)) { | 834 | if (!(sample_width & p->acc_width)) { |
835 | snd_printd("%s: Unsupported PCM sample width\n", __FUNCTION__); | 835 | snd_printd("%s: Unsupported PCM sample width\n", __func__); |
836 | return -EINVAL; | 836 | return -EINVAL; |
837 | } | 837 | } |
838 | if (!(channels & p->acc_channels)) { | 838 | if (!(channels & p->acc_channels)) { |
839 | snd_printd("%s: Invalid number of channels\n", __FUNCTION__); | 839 | snd_printd("%s: Invalid number of channels\n", __func__); |
840 | return -EINVAL; | 840 | return -EINVAL; |
841 | } | 841 | } |
842 | 842 | ||
@@ -858,11 +858,11 @@ static int snd_sb_csp_start(struct snd_sb_csp * p, int sample_width, int channel | |||
858 | s_type |= 0x22; /* 00dX 00dX (d = 1 if 8 bit samples) */ | 858 | s_type |= 0x22; /* 00dX 00dX (d = 1 if 8 bit samples) */ |
859 | 859 | ||
860 | if (set_codec_parameter(p->chip, 0x81, s_type)) { | 860 | if (set_codec_parameter(p->chip, 0x81, s_type)) { |
861 | snd_printd("%s: Set sample type command failed\n", __FUNCTION__); | 861 | snd_printd("%s: Set sample type command failed\n", __func__); |
862 | goto __fail; | 862 | goto __fail; |
863 | } | 863 | } |
864 | if (set_codec_parameter(p->chip, 0x80, 0x00)) { | 864 | if (set_codec_parameter(p->chip, 0x80, 0x00)) { |
865 | snd_printd("%s: Codec start command failed\n", __FUNCTION__); | 865 | snd_printd("%s: Codec start command failed\n", __func__); |
866 | goto __fail; | 866 | goto __fail; |
867 | } | 867 | } |
868 | p->run_width = sample_width; | 868 | p->run_width = sample_width; |
diff --git a/sound/isa/sb/sb_common.c b/sound/isa/sb/sb_common.c index d63c1af550de..b432d9ae874b 100644 --- a/sound/isa/sb/sb_common.c +++ b/sound/isa/sb/sb_common.c | |||
@@ -51,7 +51,7 @@ int snd_sbdsp_command(struct snd_sb *chip, unsigned char val) | |||
51 | outb(val, SBP(chip, COMMAND)); | 51 | outb(val, SBP(chip, COMMAND)); |
52 | return 1; | 52 | return 1; |
53 | } | 53 | } |
54 | snd_printd("%s [0x%lx]: timeout (0x%x)\n", __FUNCTION__, chip->port, val); | 54 | snd_printd("%s [0x%lx]: timeout (0x%x)\n", __func__, chip->port, val); |
55 | return 0; | 55 | return 0; |
56 | } | 56 | } |
57 | 57 | ||
@@ -68,7 +68,7 @@ int snd_sbdsp_get_byte(struct snd_sb *chip) | |||
68 | return val; | 68 | return val; |
69 | } | 69 | } |
70 | } | 70 | } |
71 | snd_printd("%s [0x%lx]: timeout\n", __FUNCTION__, chip->port); | 71 | snd_printd("%s [0x%lx]: timeout\n", __func__, chip->port); |
72 | return -ENODEV; | 72 | return -ENODEV; |
73 | } | 73 | } |
74 | 74 | ||
@@ -87,7 +87,7 @@ int snd_sbdsp_reset(struct snd_sb *chip) | |||
87 | else | 87 | else |
88 | break; | 88 | break; |
89 | } | 89 | } |
90 | snd_printdd("%s [0x%lx] failed...\n", __FUNCTION__, chip->port); | 90 | snd_printdd("%s [0x%lx] failed...\n", __func__, chip->port); |
91 | return -ENODEV; | 91 | return -ENODEV; |
92 | } | 92 | } |
93 | 93 | ||
diff --git a/sound/oss/trident.h b/sound/oss/trident.h index 4713b49fc91d..ff30a1d7c2f1 100644 --- a/sound/oss/trident.h +++ b/sound/oss/trident.h | |||
@@ -322,7 +322,7 @@ enum miscint_bits { | |||
322 | #define VALIDATE_MAGIC(FOO,MAG) \ | 322 | #define VALIDATE_MAGIC(FOO,MAG) \ |
323 | ({ \ | 323 | ({ \ |
324 | if (!(FOO) || (FOO)->magic != MAG) { \ | 324 | if (!(FOO) || (FOO)->magic != MAG) { \ |
325 | printk(invalid_magic,__FUNCTION__); \ | 325 | printk(invalid_magic,__func__); \ |
326 | return -ENXIO; \ | 326 | return -ENXIO; \ |
327 | } \ | 327 | } \ |
328 | }) | 328 | }) |
diff --git a/sound/oss/vwsnd.c b/sound/oss/vwsnd.c index d25249a932bf..2c5aaa58046d 100644 --- a/sound/oss/vwsnd.c +++ b/sound/oss/vwsnd.c | |||
@@ -194,11 +194,11 @@ static void dbgassert(const char *fcn, int line, const char *expr) | |||
194 | * DBGRV - debug print function return when verbose | 194 | * DBGRV - debug print function return when verbose |
195 | */ | 195 | */ |
196 | 196 | ||
197 | #define ASSERT(e) ((e) ? (void) 0 : dbgassert(__FUNCTION__, __LINE__, #e)) | 197 | #define ASSERT(e) ((e) ? (void) 0 : dbgassert(__func__, __LINE__, #e)) |
198 | #define DBGDO(x) x | 198 | #define DBGDO(x) x |
199 | #define DBGX(fmt, args...) (in_interrupt() ? 0 : printk(KERN_ERR fmt, ##args)) | 199 | #define DBGX(fmt, args...) (in_interrupt() ? 0 : printk(KERN_ERR fmt, ##args)) |
200 | #define DBGP(fmt, args...) (DBGX("%s: " fmt, __FUNCTION__ , ##args)) | 200 | #define DBGP(fmt, args...) (DBGX("%s: " fmt, __func__ , ##args)) |
201 | #define DBGE(fmt, args...) (DBGX("%s" fmt, __FUNCTION__ , ##args)) | 201 | #define DBGE(fmt, args...) (DBGX("%s" fmt, __func__ , ##args)) |
202 | #define DBGC(rtn) (DBGP("calling %s\n", rtn)) | 202 | #define DBGC(rtn) (DBGP("calling %s\n", rtn)) |
203 | #define DBGR() (DBGP("returning\n")) | 203 | #define DBGR() (DBGP("returning\n")) |
204 | #define DBGXV(fmt, args...) (shut_up ? 0 : DBGX(fmt, ##args)) | 204 | #define DBGXV(fmt, args...) (shut_up ? 0 : DBGX(fmt, ##args)) |
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; |
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; |
diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c index 0a3c630951be..301002cd3fc8 100644 --- a/sound/soc/s3c24xx/s3c24xx-i2s.c +++ b/sound/soc/s3c24xx/s3c24xx-i2s.c | |||
@@ -89,7 +89,7 @@ static void s3c24xx_snd_txctrl(int on) | |||
89 | u32 iiscon; | 89 | u32 iiscon; |
90 | u32 iismod; | 90 | u32 iismod; |
91 | 91 | ||
92 | DBG("Entered %s\n", __FUNCTION__); | 92 | DBG("Entered %s\n", __func__); |
93 | 93 | ||
94 | iisfcon = readl(s3c24xx_i2s.regs + S3C2410_IISFCON); | 94 | iisfcon = readl(s3c24xx_i2s.regs + S3C2410_IISFCON); |
95 | iiscon = readl(s3c24xx_i2s.regs + S3C2410_IISCON); | 95 | iiscon = readl(s3c24xx_i2s.regs + S3C2410_IISCON); |
@@ -134,7 +134,7 @@ static void s3c24xx_snd_rxctrl(int on) | |||
134 | u32 iiscon; | 134 | u32 iiscon; |
135 | u32 iismod; | 135 | u32 iismod; |
136 | 136 | ||
137 | DBG("Entered %s\n", __FUNCTION__); | 137 | DBG("Entered %s\n", __func__); |
138 | 138 | ||
139 | iisfcon = readl(s3c24xx_i2s.regs + S3C2410_IISFCON); | 139 | iisfcon = readl(s3c24xx_i2s.regs + S3C2410_IISFCON); |
140 | iiscon = readl(s3c24xx_i2s.regs + S3C2410_IISCON); | 140 | iiscon = readl(s3c24xx_i2s.regs + S3C2410_IISCON); |
@@ -182,7 +182,7 @@ static int s3c24xx_snd_lrsync(void) | |||
182 | u32 iiscon; | 182 | u32 iiscon; |
183 | unsigned long timeout = jiffies + msecs_to_jiffies(5); | 183 | unsigned long timeout = jiffies + msecs_to_jiffies(5); |
184 | 184 | ||
185 | DBG("Entered %s\n", __FUNCTION__); | 185 | DBG("Entered %s\n", __func__); |
186 | 186 | ||
187 | while (1) { | 187 | while (1) { |
188 | iiscon = readl(s3c24xx_i2s.regs + S3C2410_IISCON); | 188 | iiscon = readl(s3c24xx_i2s.regs + S3C2410_IISCON); |
@@ -201,7 +201,7 @@ static int s3c24xx_snd_lrsync(void) | |||
201 | */ | 201 | */ |
202 | static inline int s3c24xx_snd_is_clkmaster(void) | 202 | static inline int s3c24xx_snd_is_clkmaster(void) |
203 | { | 203 | { |
204 | DBG("Entered %s\n", __FUNCTION__); | 204 | DBG("Entered %s\n", __func__); |
205 | 205 | ||
206 | return (readl(s3c24xx_i2s.regs + S3C2410_IISMOD) & S3C2410_IISMOD_SLAVE) ? 0:1; | 206 | return (readl(s3c24xx_i2s.regs + S3C2410_IISMOD) & S3C2410_IISMOD_SLAVE) ? 0:1; |
207 | } | 207 | } |
@@ -214,7 +214,7 @@ static int s3c24xx_i2s_set_fmt(struct snd_soc_cpu_dai *cpu_dai, | |||
214 | { | 214 | { |
215 | u32 iismod; | 215 | u32 iismod; |
216 | 216 | ||
217 | DBG("Entered %s\n", __FUNCTION__); | 217 | DBG("Entered %s\n", __func__); |
218 | 218 | ||
219 | iismod = readl(s3c24xx_i2s.regs + S3C2410_IISMOD); | 219 | iismod = readl(s3c24xx_i2s.regs + S3C2410_IISMOD); |
220 | DBG("hw_params r: IISMOD: %lx \n", iismod); | 220 | DBG("hw_params r: IISMOD: %lx \n", iismod); |
@@ -250,7 +250,7 @@ static int s3c24xx_i2s_hw_params(struct snd_pcm_substream *substream, | |||
250 | struct snd_soc_pcm_runtime *rtd = substream->private_data; | 250 | struct snd_soc_pcm_runtime *rtd = substream->private_data; |
251 | u32 iismod; | 251 | u32 iismod; |
252 | 252 | ||
253 | DBG("Entered %s\n", __FUNCTION__); | 253 | DBG("Entered %s\n", __func__); |
254 | 254 | ||
255 | if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) | 255 | if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) |
256 | rtd->dai->cpu_dai->dma_data = &s3c24xx_i2s_pcm_stereo_out; | 256 | rtd->dai->cpu_dai->dma_data = &s3c24xx_i2s_pcm_stereo_out; |
@@ -278,7 +278,7 @@ static int s3c24xx_i2s_trigger(struct snd_pcm_substream *substream, int cmd) | |||
278 | { | 278 | { |
279 | int ret = 0; | 279 | int ret = 0; |
280 | 280 | ||
281 | DBG("Entered %s\n", __FUNCTION__); | 281 | DBG("Entered %s\n", __func__); |
282 | 282 | ||
283 | switch (cmd) { | 283 | switch (cmd) { |
284 | case SNDRV_PCM_TRIGGER_START: | 284 | case SNDRV_PCM_TRIGGER_START: |
@@ -320,7 +320,7 @@ static int s3c24xx_i2s_set_sysclk(struct snd_soc_cpu_dai *cpu_dai, | |||
320 | { | 320 | { |
321 | u32 iismod = readl(s3c24xx_i2s.regs + S3C2410_IISMOD); | 321 | u32 iismod = readl(s3c24xx_i2s.regs + S3C2410_IISMOD); |
322 | 322 | ||
323 | DBG("Entered %s\n", __FUNCTION__); | 323 | DBG("Entered %s\n", __func__); |
324 | 324 | ||
325 | iismod &= ~S3C2440_IISMOD_MPLL; | 325 | iismod &= ~S3C2440_IISMOD_MPLL; |
326 | 326 | ||
@@ -346,7 +346,7 @@ static int s3c24xx_i2s_set_clkdiv(struct snd_soc_cpu_dai *cpu_dai, | |||
346 | { | 346 | { |
347 | u32 reg; | 347 | u32 reg; |
348 | 348 | ||
349 | DBG("Entered %s\n", __FUNCTION__); | 349 | DBG("Entered %s\n", __func__); |
350 | 350 | ||
351 | switch (div_id) { | 351 | switch (div_id) { |
352 | case S3C24XX_DIV_BCLK: | 352 | case S3C24XX_DIV_BCLK: |
@@ -381,7 +381,7 @@ EXPORT_SYMBOL_GPL(s3c24xx_i2s_get_clockrate); | |||
381 | 381 | ||
382 | static int s3c24xx_i2s_probe(struct platform_device *pdev) | 382 | static int s3c24xx_i2s_probe(struct platform_device *pdev) |
383 | { | 383 | { |
384 | DBG("Entered %s\n", __FUNCTION__); | 384 | DBG("Entered %s\n", __func__); |
385 | 385 | ||
386 | s3c24xx_i2s.regs = ioremap(S3C2410_PA_IIS, 0x100); | 386 | s3c24xx_i2s.regs = ioremap(S3C2410_PA_IIS, 0x100); |
387 | if (s3c24xx_i2s.regs == NULL) | 387 | if (s3c24xx_i2s.regs == NULL) |
diff --git a/sound/soc/s3c24xx/s3c24xx-pcm.c b/sound/soc/s3c24xx/s3c24xx-pcm.c index 29a6c82f873a..40112e2b1ecb 100644 --- a/sound/soc/s3c24xx/s3c24xx-pcm.c +++ b/sound/soc/s3c24xx/s3c24xx-pcm.c | |||
@@ -88,7 +88,7 @@ static void s3c24xx_pcm_enqueue(struct snd_pcm_substream *substream) | |||
88 | dma_addr_t pos = prtd->dma_pos; | 88 | dma_addr_t pos = prtd->dma_pos; |
89 | int ret; | 89 | int ret; |
90 | 90 | ||
91 | DBG("Entered %s\n", __FUNCTION__); | 91 | DBG("Entered %s\n", __func__); |
92 | 92 | ||
93 | while (prtd->dma_loaded < prtd->dma_limit) { | 93 | while (prtd->dma_loaded < prtd->dma_limit) { |
94 | unsigned long len = prtd->dma_period; | 94 | unsigned long len = prtd->dma_period; |
@@ -98,7 +98,7 @@ static void s3c24xx_pcm_enqueue(struct snd_pcm_substream *substream) | |||
98 | if ((pos + len) > prtd->dma_end) { | 98 | if ((pos + len) > prtd->dma_end) { |
99 | len = prtd->dma_end - pos; | 99 | len = prtd->dma_end - pos; |
100 | DBG(KERN_DEBUG "%s: corrected dma len %ld\n", | 100 | DBG(KERN_DEBUG "%s: corrected dma len %ld\n", |
101 | __FUNCTION__, len); | 101 | __func__, len); |
102 | } | 102 | } |
103 | 103 | ||
104 | ret = s3c2410_dma_enqueue(prtd->params->channel, | 104 | ret = s3c2410_dma_enqueue(prtd->params->channel, |
@@ -123,7 +123,7 @@ static void s3c24xx_audio_buffdone(struct s3c2410_dma_chan *channel, | |||
123 | struct snd_pcm_substream *substream = dev_id; | 123 | struct snd_pcm_substream *substream = dev_id; |
124 | struct s3c24xx_runtime_data *prtd; | 124 | struct s3c24xx_runtime_data *prtd; |
125 | 125 | ||
126 | DBG("Entered %s\n", __FUNCTION__); | 126 | DBG("Entered %s\n", __func__); |
127 | 127 | ||
128 | if (result == S3C2410_RES_ABORT || result == S3C2410_RES_ERR) | 128 | if (result == S3C2410_RES_ABORT || result == S3C2410_RES_ERR) |
129 | return; | 129 | return; |
@@ -152,7 +152,7 @@ static int s3c24xx_pcm_hw_params(struct snd_pcm_substream *substream, | |||
152 | unsigned long totbytes = params_buffer_bytes(params); | 152 | unsigned long totbytes = params_buffer_bytes(params); |
153 | int ret=0; | 153 | int ret=0; |
154 | 154 | ||
155 | DBG("Entered %s\n", __FUNCTION__); | 155 | DBG("Entered %s\n", __func__); |
156 | 156 | ||
157 | /* return if this is a bufferless transfer e.g. | 157 | /* return if this is a bufferless transfer e.g. |
158 | * codec <--> BT codec or GSM modem -- lg FIXME */ | 158 | * codec <--> BT codec or GSM modem -- lg FIXME */ |
@@ -200,7 +200,7 @@ static int s3c24xx_pcm_hw_free(struct snd_pcm_substream *substream) | |||
200 | { | 200 | { |
201 | struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; | 201 | struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; |
202 | 202 | ||
203 | DBG("Entered %s\n", __FUNCTION__); | 203 | DBG("Entered %s\n", __func__); |
204 | 204 | ||
205 | /* TODO - do we need to ensure DMA flushed */ | 205 | /* TODO - do we need to ensure DMA flushed */ |
206 | snd_pcm_set_runtime_buffer(substream, NULL); | 206 | snd_pcm_set_runtime_buffer(substream, NULL); |
@@ -218,7 +218,7 @@ static int s3c24xx_pcm_prepare(struct snd_pcm_substream *substream) | |||
218 | struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; | 218 | struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; |
219 | int ret = 0; | 219 | int ret = 0; |
220 | 220 | ||
221 | DBG("Entered %s\n", __FUNCTION__); | 221 | DBG("Entered %s\n", __func__); |
222 | 222 | ||
223 | /* return if this is a bufferless transfer e.g. | 223 | /* return if this is a bufferless transfer e.g. |
224 | * codec <--> BT codec or GSM modem -- lg FIXME */ | 224 | * codec <--> BT codec or GSM modem -- lg FIXME */ |
@@ -263,7 +263,7 @@ static int s3c24xx_pcm_trigger(struct snd_pcm_substream *substream, int cmd) | |||
263 | struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; | 263 | struct s3c24xx_runtime_data *prtd = substream->runtime->private_data; |
264 | int ret = 0; | 264 | int ret = 0; |
265 | 265 | ||
266 | DBG("Entered %s\n", __FUNCTION__); | 266 | DBG("Entered %s\n", __func__); |
267 | 267 | ||
268 | spin_lock(&prtd->lock); | 268 | spin_lock(&prtd->lock); |
269 | 269 | ||
@@ -301,7 +301,7 @@ static snd_pcm_uframes_t | |||
301 | unsigned long res; | 301 | unsigned long res; |
302 | dma_addr_t src, dst; | 302 | dma_addr_t src, dst; |
303 | 303 | ||
304 | DBG("Entered %s\n", __FUNCTION__); | 304 | DBG("Entered %s\n", __func__); |
305 | 305 | ||
306 | spin_lock(&prtd->lock); | 306 | spin_lock(&prtd->lock); |
307 | s3c2410_dma_getposition(prtd->params->channel, &src, &dst); | 307 | s3c2410_dma_getposition(prtd->params->channel, &src, &dst); |
@@ -334,7 +334,7 @@ static int s3c24xx_pcm_open(struct snd_pcm_substream *substream) | |||
334 | struct snd_pcm_runtime *runtime = substream->runtime; | 334 | struct snd_pcm_runtime *runtime = substream->runtime; |
335 | struct s3c24xx_runtime_data *prtd; | 335 | struct s3c24xx_runtime_data *prtd; |
336 | 336 | ||
337 | DBG("Entered %s\n", __FUNCTION__); | 337 | DBG("Entered %s\n", __func__); |
338 | 338 | ||
339 | snd_soc_set_runtime_hwparams(substream, &s3c24xx_pcm_hardware); | 339 | snd_soc_set_runtime_hwparams(substream, &s3c24xx_pcm_hardware); |
340 | 340 | ||
@@ -353,7 +353,7 @@ static int s3c24xx_pcm_close(struct snd_pcm_substream *substream) | |||
353 | struct snd_pcm_runtime *runtime = substream->runtime; | 353 | struct snd_pcm_runtime *runtime = substream->runtime; |
354 | struct s3c24xx_runtime_data *prtd = runtime->private_data; | 354 | struct s3c24xx_runtime_data *prtd = runtime->private_data; |
355 | 355 | ||
356 | DBG("Entered %s\n", __FUNCTION__); | 356 | DBG("Entered %s\n", __func__); |
357 | 357 | ||
358 | if (prtd) | 358 | if (prtd) |
359 | kfree(prtd); | 359 | kfree(prtd); |
@@ -368,7 +368,7 @@ static int s3c24xx_pcm_mmap(struct snd_pcm_substream *substream, | |||
368 | { | 368 | { |
369 | struct snd_pcm_runtime *runtime = substream->runtime; | 369 | struct snd_pcm_runtime *runtime = substream->runtime; |
370 | 370 | ||
371 | DBG("Entered %s\n", __FUNCTION__); | 371 | DBG("Entered %s\n", __func__); |
372 | 372 | ||
373 | return dma_mmap_writecombine(substream->pcm->card->dev, vma, | 373 | return dma_mmap_writecombine(substream->pcm->card->dev, vma, |
374 | runtime->dma_area, | 374 | runtime->dma_area, |
@@ -394,7 +394,7 @@ static int s3c24xx_pcm_preallocate_dma_buffer(struct snd_pcm *pcm, int stream) | |||
394 | struct snd_dma_buffer *buf = &substream->dma_buffer; | 394 | struct snd_dma_buffer *buf = &substream->dma_buffer; |
395 | size_t size = s3c24xx_pcm_hardware.buffer_bytes_max; | 395 | size_t size = s3c24xx_pcm_hardware.buffer_bytes_max; |
396 | 396 | ||
397 | DBG("Entered %s\n", __FUNCTION__); | 397 | DBG("Entered %s\n", __func__); |
398 | 398 | ||
399 | buf->dev.type = SNDRV_DMA_TYPE_DEV; | 399 | buf->dev.type = SNDRV_DMA_TYPE_DEV; |
400 | buf->dev.dev = pcm->card->dev; | 400 | buf->dev.dev = pcm->card->dev; |
@@ -413,7 +413,7 @@ static void s3c24xx_pcm_free_dma_buffers(struct snd_pcm *pcm) | |||
413 | struct snd_dma_buffer *buf; | 413 | struct snd_dma_buffer *buf; |
414 | int stream; | 414 | int stream; |
415 | 415 | ||
416 | DBG("Entered %s\n", __FUNCTION__); | 416 | DBG("Entered %s\n", __func__); |
417 | 417 | ||
418 | for (stream = 0; stream < 2; stream++) { | 418 | for (stream = 0; stream < 2; stream++) { |
419 | substream = pcm->streams[stream].substream; | 419 | substream = pcm->streams[stream].substream; |
@@ -437,7 +437,7 @@ static int s3c24xx_pcm_new(struct snd_card *card, | |||
437 | { | 437 | { |
438 | int ret = 0; | 438 | int ret = 0; |
439 | 439 | ||
440 | DBG("Entered %s\n", __FUNCTION__); | 440 | DBG("Entered %s\n", __func__); |
441 | 441 | ||
442 | if (!card->dev->dma_mask) | 442 | if (!card->dev->dma_mask) |
443 | card->dev->dma_mask = &s3c24xx_pcm_dmamask; | 443 | card->dev->dma_mask = &s3c24xx_pcm_dmamask; |
diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index abac6847ecad..4c64560493f5 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c | |||
@@ -1288,7 +1288,7 @@ int snd_soc_dapm_stream_event(struct snd_soc_codec *codec, | |||
1288 | mutex_unlock(&codec->mutex); | 1288 | mutex_unlock(&codec->mutex); |
1289 | 1289 | ||
1290 | dapm_power_widgets(codec, event); | 1290 | dapm_power_widgets(codec, event); |
1291 | dump_dapm(codec, __FUNCTION__); | 1291 | dump_dapm(codec, __func__); |
1292 | return 0; | 1292 | return 0; |
1293 | } | 1293 | } |
1294 | EXPORT_SYMBOL_GPL(snd_soc_dapm_stream_event); | 1294 | EXPORT_SYMBOL_GPL(snd_soc_dapm_stream_event); |