[alsa-devel] [PATCH 35/35] sound/soc: Convert remaining uses of pr_warning to pr_warn

Nicolin Chen nicoleotsuka at gmail.com
Fri Feb 17 21:28:44 CET 2017


On Thu, Feb 16, 2017 at 11:11:48PM -0800, Joe Perches wrote:
> To enable eventual removal of pr_warning
> 
> This makes pr_warn use consistent for sound/soc
> 
> Prior to this patch, there were 5 uses of pr_warning and
> 10 uses of pr_warn in sound/soc
> 
> Signed-off-by: Joe Perches <joe at perches.com>

For imx-audmux.c,

Acked-by: Nicolin Chen <nicoleotsuka at gmail.com>

> ---
>  sound/soc/fsl/imx-audmux.c     | 6 +++---
>  sound/soc/samsung/s3c-i2s-v2.c | 6 +++---
>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/sound/soc/fsl/imx-audmux.c b/sound/soc/fsl/imx-audmux.c
> index fc57da341d61..41e877d2b400 100644
> --- a/sound/soc/fsl/imx-audmux.c
> +++ b/sound/soc/fsl/imx-audmux.c
> @@ -152,7 +152,7 @@ static void audmux_debugfs_init(void)
>  
>  	audmux_debugfs_root = debugfs_create_dir("audmux", NULL);
>  	if (!audmux_debugfs_root) {
> -		pr_warning("Failed to create AUDMUX debugfs root\n");
> +		pr_warn("Failed to create AUDMUX debugfs root\n");
>  		return;
>  	}
>  
> @@ -160,8 +160,8 @@ static void audmux_debugfs_init(void)
>  		snprintf(buf, sizeof(buf), "ssi%lu", i);
>  		if (!debugfs_create_file(buf, 0444, audmux_debugfs_root,
>  					 (void *)i, &audmux_debugfs_fops))
> -			pr_warning("Failed to create AUDMUX port %lu debugfs file\n",
> -				   i);
> +			pr_warn("Failed to create AUDMUX port %lu debugfs file\n",
> +				i);
>  	}
>  }
>  
> diff --git a/sound/soc/samsung/s3c-i2s-v2.c b/sound/soc/samsung/s3c-i2s-v2.c
> index 644f186fd35c..7423e4257a1b 100644
> --- a/sound/soc/samsung/s3c-i2s-v2.c
> +++ b/sound/soc/samsung/s3c-i2s-v2.c
> @@ -669,13 +669,13 @@ static int s3c2412_i2s_suspend(struct snd_soc_dai *dai)
>  		iismod = readl(i2s->regs + S3C2412_IISMOD);
>  
>  		if (iismod & S3C2412_IISCON_RXDMA_ACTIVE)
> -			pr_warning("%s: RXDMA active?\n", __func__);
> +			pr_warn("%s: RXDMA active?\n", __func__);
>  
>  		if (iismod & S3C2412_IISCON_TXDMA_ACTIVE)
> -			pr_warning("%s: TXDMA active?\n", __func__);
> +			pr_warn("%s: TXDMA active?\n", __func__);
>  
>  		if (iismod & S3C2412_IISCON_IIS_ACTIVE)
> -			pr_warning("%s: IIS active\n", __func__);
> +			pr_warn("%s: IIS active\n", __func__);
>  	}
>  
>  	return 0;
> -- 
> 2.10.0.rc2.1.g053435c
> 


More information about the Alsa-devel mailing list