Commit 9bf8e7dd authored by Harvey Harrison's avatar Harvey Harrison Committed by Takashi Iwai
Browse files

[ALSA] sound: replace remaining __FUNCTION__ occurences 



__FUNCTION__ is gcc-specific, use __func__

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 24982c5f

sound/arm/pxa2xx-ac97.c

+4 −4
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ static unsigned short pxa2xx_ac97_read(struct snd_ac97 *ac97, unsigned short reg 
	if (wait_event_timeout(gsr_wq, (GSR | gsr_bits) & GSR_SDONE, 1) <= 0 &&

	    !((GSR | gsr_bits) & GSR_SDONE)) {

		printk(KERN_ERR "%s: read error (ac97_reg=%d GSR=%#lx)\n",

				__FUNCTION__, reg, GSR | gsr_bits);

				__func__, reg, GSR | gsr_bits);

		val = -1;

		goto out;

	}
@@ -104,7 +104,7 @@ static void pxa2xx_ac97_write(struct snd_ac97 *ac97, unsigned short reg, unsigne 
	if (wait_event_timeout(gsr_wq, (GSR | gsr_bits) & GSR_CDONE, 1) <= 0 &&

	    !((GSR | gsr_bits) & GSR_CDONE))

		printk(KERN_ERR "%s: write error (ac97_reg=%d GSR=%#lx)\n",

				__FUNCTION__, reg, GSR | gsr_bits);

				__func__, reg, GSR | gsr_bits);



	mutex_unlock(&car_mutex);

}
@@ -131,7 +131,7 @@ static void pxa2xx_ac97_reset(struct snd_ac97 *ac97) 


	if (!((GSR | gsr_bits) & (GSR_PCR | GSR_SCR))) {

		printk(KERN_INFO "%s: cold reset timeout (GSR=%#lx)\n",

				 __FUNCTION__, gsr_bits);

				 __func__, gsr_bits);



		/* let's try warm reset */

		gsr_bits = 0;
@@ -150,7 +150,7 @@ static void pxa2xx_ac97_reset(struct snd_ac97 *ac97) 


		if (!((GSR | gsr_bits) & (GSR_PCR | GSR_SCR)))

			printk(KERN_INFO "%s: warm reset timeout (GSR=%#lx)\n",

					 __FUNCTION__, gsr_bits);

					 __func__, gsr_bits);

	}



	GCR &= ~(GCR_PRIRDY_IEN|GCR_SECRDY_IEN);

sound/core/init.c

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ static int snd_disconnect_release(struct inode *inode, struct file *file) 
	if (likely(df))

		return df->disconnected_f_op->release(inode, file);



	panic("%s(%p, %p) failed!", __FUNCTION__, inode, file);

	panic("%s(%p, %p) failed!", __func__, inode, file);

}



static unsigned int snd_disconnect_poll(struct file * file, poll_table * wait)

sound/isa/sb/sb16_csp.c

+14 −14
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ static int snd_sb_csp_riff_load(struct snd_sb_csp * p, 
		return -EFAULT;

	if ((file_h.name != RIFF_HEADER) ||

	    (le32_to_cpu(file_h.len) >= SNDRV_SB_CSP_MAX_MICROCODE_FILE_SIZE - sizeof(file_h))) {

		snd_printd("%s: Invalid RIFF header\n", __FUNCTION__);

		snd_printd("%s: Invalid RIFF header\n", __func__);

		return -EINVAL;

	}

	data_ptr += sizeof(file_h);
@@ -340,7 +340,7 @@ static int snd_sb_csp_riff_load(struct snd_sb_csp * p, 
	if (copy_from_user(&item_type, data_ptr, sizeof(item_type)))

		return -EFAULT;

	if (item_type != CSP__HEADER) {

		snd_printd("%s: Invalid RIFF file type\n", __FUNCTION__);

		snd_printd("%s: Invalid RIFF file type\n", __func__);

		return -EINVAL;

	}

	data_ptr += sizeof (item_type);
@@ -395,7 +395,7 @@ static int snd_sb_csp_riff_load(struct snd_sb_csp * p, 
				return -EFAULT;



			if (code_h.name != MAIN_HEADER) {

				snd_printd("%s: Missing 'main' microcode\n", __FUNCTION__);

				snd_printd("%s: Missing 'main' microcode\n", __func__);

				return -EINVAL;

			}

			data_ptr += sizeof(code_h);
@@ -439,7 +439,7 @@ static int snd_sb_csp_riff_load(struct snd_sb_csp * p, 
				p->acc_format = p->acc_width = p->acc_rates = 0;

				p->mode = 0;

				snd_printd("%s: Unsupported CSP codec type: 0x%04x\n",

					   __FUNCTION__,

					   __func__,

					   le16_to_cpu(funcdesc_h.VOC_type));

				return -EINVAL;

			}
@@ -458,7 +458,7 @@ static int snd_sb_csp_riff_load(struct snd_sb_csp * p, 
			return 0;

		}

	}

	snd_printd("%s: Function #%d not found\n", __FUNCTION__, info.func_req);

	snd_printd("%s: Function #%d not found\n", __func__, info.func_req);

	return -EINVAL;

}
@@ -612,7 +612,7 @@ static int get_version(struct snd_sb *chip) 
static int snd_sb_csp_check_version(struct snd_sb_csp * p)

{

	if (p->version < 0x10 || p->version > 0x1f) {

		snd_printd("%s: Invalid CSP version: 0x%x\n", __FUNCTION__, p->version);

		snd_printd("%s: Invalid CSP version: 0x%x\n", __func__, p->version);

		return 1;

	}

	return 0;
@@ -631,7 +631,7 @@ static int snd_sb_csp_load(struct snd_sb_csp * p, const unsigned char *buf, int 
	spin_lock_irqsave(&p->chip->reg_lock, flags);

	snd_sbdsp_command(p->chip, 0x01);	/* CSP download command */

	if (snd_sbdsp_get_byte(p->chip)) {

		snd_printd("%s: Download command failed\n", __FUNCTION__);

		snd_printd("%s: Download command failed\n", __func__);

		goto __fail;

	}

	/* 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 
			udelay (10);

		}

		if (status != 0x55) {

			snd_printd("%s: Microcode initialization failed\n", __FUNCTION__);

			snd_printd("%s: Microcode initialization failed\n", __func__);

			goto __fail;

		}

	} else {
@@ -824,19 +824,19 @@ static int snd_sb_csp_start(struct snd_sb_csp * p, int sample_width, int channel 
	unsigned long flags;



	if (!(p->running & (SNDRV_SB_CSP_ST_LOADED | SNDRV_SB_CSP_ST_AUTO))) {

		snd_printd("%s: Microcode not loaded\n", __FUNCTION__);

		snd_printd("%s: Microcode not loaded\n", __func__);

		return -ENXIO;

	}

	if (p->running & SNDRV_SB_CSP_ST_RUNNING) {

		snd_printd("%s: CSP already running\n", __FUNCTION__);

		snd_printd("%s: CSP already running\n", __func__);

		return -EBUSY;

	}

	if (!(sample_width & p->acc_width)) {

		snd_printd("%s: Unsupported PCM sample width\n", __FUNCTION__);

		snd_printd("%s: Unsupported PCM sample width\n", __func__);

		return -EINVAL;

	}

	if (!(channels & p->acc_channels)) {

		snd_printd("%s: Invalid number of channels\n", __FUNCTION__);

		snd_printd("%s: Invalid number of channels\n", __func__);

		return -EINVAL;

	}
@@ -858,11 +858,11 @@ static int snd_sb_csp_start(struct snd_sb_csp * p, int sample_width, int channel 
		s_type |= 0x22;	/* 00dX 00dX    (d = 1 if 8 bit samples) */



	if (set_codec_parameter(p->chip, 0x81, s_type)) {

		snd_printd("%s: Set sample type command failed\n", __FUNCTION__);

		snd_printd("%s: Set sample type command failed\n", __func__);

		goto __fail;

	}

	if (set_codec_parameter(p->chip, 0x80, 0x00)) {

		snd_printd("%s: Codec start command failed\n", __FUNCTION__);

		snd_printd("%s: Codec start command failed\n", __func__);

		goto __fail;

	}

	p->run_width = sample_width;

sound/isa/sb/sb_common.c

+3 −3
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ int snd_sbdsp_command(struct snd_sb *chip, unsigned char val) 
			outb(val, SBP(chip, COMMAND));

			return 1;

		}

	snd_printd("%s [0x%lx]: timeout (0x%x)\n", __FUNCTION__, chip->port, val);

	snd_printd("%s [0x%lx]: timeout (0x%x)\n", __func__, chip->port, val);

	return 0;

}
@@ -68,7 +68,7 @@ int snd_sbdsp_get_byte(struct snd_sb *chip) 
			return val;

		}

	}

	snd_printd("%s [0x%lx]: timeout\n", __FUNCTION__, chip->port);

	snd_printd("%s [0x%lx]: timeout\n", __func__, chip->port);

	return -ENODEV;

}
@@ -87,7 +87,7 @@ int snd_sbdsp_reset(struct snd_sb *chip) 
			else

				break;

		}

	snd_printdd("%s [0x%lx] failed...\n", __FUNCTION__, chip->port);

	snd_printdd("%s [0x%lx] failed...\n", __func__, chip->port);

	return -ENODEV;

}

sound/oss/trident.h

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ enum miscint_bits { 
#define VALIDATE_MAGIC(FOO,MAG)				\

({						  	\

	if (!(FOO) || (FOO)->magic != MAG) { 		\

		printk(invalid_magic,__FUNCTION__);	\

		printk(invalid_magic,__func__);	\

		return -ENXIO;			  	\

	}					  	\

})