aboutsummaryrefslogtreecommitdiffstats
path: root/sound/isa/sb/sb16_csp.c
diff options
context:
space:
mode:
authorHarvey Harrison <harvey.harrison@gmail.com>2008-03-03 18:32:18 -0500
committerTakashi Iwai <tiwai@suse.de>2008-04-24 06:00:20 -0400
commit9bf8e7ddeaf57f1ec534014c447705ad31d5d721 (patch)
tree6cb4dd4763631bf9f181ba30ffce6ebbfc70073b /sound/isa/sb/sb16_csp.c
parent24982c5f7feca2f4d1b0b562a28b767d93a01ce0 (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>
Diffstat (limited to 'sound/isa/sb/sb16_csp.c')
-rw-r--r--sound/isa/sb/sb16_csp.c28
1 files changed, 14 insertions, 14 deletions
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)
612static int snd_sb_csp_check_version(struct snd_sb_csp * p) 612static 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;