[alsa-devel] [PATCH 1/3] soc - s3c24xx-i2s - Replace __FUNCTION__ with __func__

[Takashi Iwai]

At Tue, 22 Apr 2008 16:12:50 +0100,
Mark Brown wrote:
> 
> __FUNCTION__ is GCC specific and checkpatch won't let us submit with it.
> 
> Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>

Thanks, applied all three patches.


Takashi

> ---
>  sound/soc/s3c24xx/s3c24xx-i2s.c |   20 ++++++++++----------
>  1 files changed, 10 insertions(+), 10 deletions(-)
> 
> diff --git a/sound/soc/s3c24xx/s3c24xx-i2s.c b/sound/soc/s3c24xx/s3c24xx-i2s.c
> index 6b3cbbf..7d38f55 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)
>  	u32 iiscon;
>  	u32 iismod;
>  
> -	DBG("Entered %s\n", __FUNCTION__);
> +	DBG("Entered %s\n", __func__);
>  
>  	iisfcon = readl(s3c24xx_i2s.regs + S3C2410_IISFCON);
>  	iiscon  = readl(s3c24xx_i2s.regs + S3C2410_IISCON);
> @@ -134,7 +134,7 @@ static void s3c24xx_snd_rxctrl(int on)
>  	u32 iiscon;
>  	u32 iismod;
>  
> -	DBG("Entered %s\n", __FUNCTION__);
> +	DBG("Entered %s\n", __func__);
>  
>  	iisfcon = readl(s3c24xx_i2s.regs + S3C2410_IISFCON);
>  	iiscon  = readl(s3c24xx_i2s.regs + S3C2410_IISCON);
> @@ -182,7 +182,7 @@ static int s3c24xx_snd_lrsync(void)
>  	u32 iiscon;
>  	int timeout = 50; /* 5ms */
>  
> -	DBG("Entered %s\n", __FUNCTION__);
> +	DBG("Entered %s\n", __func__);
>  
>  	while (1) {
>  		iiscon = readl(s3c24xx_i2s.regs + S3C2410_IISCON);
> @@ -202,7 +202,7 @@ static int s3c24xx_snd_lrsync(void)
>   */
>  static inline int s3c24xx_snd_is_clkmaster(void)
>  {
> -	DBG("Entered %s\n", __FUNCTION__);
> +	DBG("Entered %s\n", __func__);
>  
>  	return (readl(s3c24xx_i2s.regs + S3C2410_IISMOD) & S3C2410_IISMOD_SLAVE) ? 0:1;
>  }
> @@ -215,7 +215,7 @@ static int s3c24xx_i2s_set_fmt(struct snd_soc_cpu_dai *cpu_dai,
>  {
>  	u32 iismod;
>  
> -	DBG("Entered %s\n", __FUNCTION__);
> +	DBG("Entered %s\n", __func__);
>  
>  	iismod = readl(s3c24xx_i2s.regs + S3C2410_IISMOD);
>  	DBG("hw_params r: IISMOD: %lx \n", iismod);
> @@ -251,7 +251,7 @@ static int s3c24xx_i2s_hw_params(struct snd_pcm_substream *substream,
>  	struct snd_soc_pcm_runtime *rtd = substream->private_data;
>  	u32 iismod;
>  
> -	DBG("Entered %s\n", __FUNCTION__);
> +	DBG("Entered %s\n", __func__);
>  
>  	if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
>  		rtd->dai->cpu_dai->dma_data = &s3c24xx_i2s_pcm_stereo_out;
> @@ -279,7 +279,7 @@ static int s3c24xx_i2s_trigger(struct snd_pcm_substream *substream, int cmd)
>  {
>  	int ret = 0;
>  
> -	DBG("Entered %s\n", __FUNCTION__);
> +	DBG("Entered %s\n", __func__);
>  
>  	switch (cmd) {
>  	case SNDRV_PCM_TRIGGER_START:
> @@ -321,7 +321,7 @@ static int s3c24xx_i2s_set_sysclk(struct snd_soc_cpu_dai *cpu_dai,
>  {
>  	u32 iismod = readl(s3c24xx_i2s.regs + S3C2410_IISMOD);
>  
> -	DBG("Entered %s\n", __FUNCTION__);
> +	DBG("Entered %s\n", __func__);
>  
>  	iismod &= ~S3C2440_IISMOD_MPLL;
>  
> @@ -347,7 +347,7 @@ static int s3c24xx_i2s_set_clkdiv(struct snd_soc_cpu_dai *cpu_dai,
>  {
>  	u32 reg;
>  
> -	DBG("Entered %s\n", __FUNCTION__);
> +	DBG("Entered %s\n", __func__);
>  
>  	switch (div_id) {
>  	case S3C24XX_DIV_BCLK:
> @@ -382,7 +382,7 @@ EXPORT_SYMBOL_GPL(s3c24xx_i2s_get_clockrate);
>  
>  static int s3c24xx_i2s_probe(struct platform_device *pdev)
>  {
> -	DBG("Entered %s\n", __FUNCTION__);
> +	DBG("Entered %s\n", __func__);
>  
>  	s3c24xx_i2s.regs = ioremap(S3C2410_PA_IIS, 0x100);
>  	if (s3c24xx_i2s.regs == NULL)
> -- 
> 1.5.5
>