[35/35] sound/soc: Convert remaining uses of pr_warning to pr_warn
diff mbox

Message ID 3d93f7226ba34fede99f72ec038098a3d98a139a.1487314667.git.joe@perches.com
State New
Headers show

Commit Message

Joe Perches Feb. 17, 2017, 7:11 a.m. UTC
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@perches.com>
---
 sound/soc/fsl/imx-audmux.c     | 6 +++---
 sound/soc/samsung/s3c-i2s-v2.c | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

Comments

Nicolin Chen Feb. 17, 2017, 8:28 p.m. UTC | #1
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@perches.com>

For imx-audmux.c,

Acked-by: Nicolin Chen <nicoleotsuka@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
>
Mark Brown Feb. 17, 2017, 11:48 p.m. UTC | #2
On Fri, Feb 17, 2017 at 12:28:44PM -0800, Nicolin Chen wrote:
> 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@perches.com>
> 
> For imx-audmux.c,

I don't have this patch, perhaps it got caught in a spam filter or
perhaps it got deleted because as ever you're not using subject lines
reflecting the style for the subsystem.
Nicolin Chen Feb. 17, 2017, 11:57 p.m. UTC | #3
On Fri, Feb 17, 2017 at 11:48:54PM +0000, Mark Brown wrote:
> On Fri, Feb 17, 2017 at 12:28:44PM -0800, Nicolin Chen wrote:
> > 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@perches.com>
> > 
> > For imx-audmux.c,
> 
> I don't have this patch, perhaps it got caught in a spam filter or
> perhaps it got deleted because as ever you're not using subject lines
> reflecting the style for the subsystem.

My bad that I didn't pay attention to the subject.

Joe, please fix it in v2. Thanks.

ASoC: Convert remaining uses of pr_warning to pr_warn
Joe Perches Feb. 18, 2017, 12:20 a.m. UTC | #4
On Fri, 2017-02-17 at 15:57 -0800, Nicolin Chen wrote:
> On Fri, Feb 17, 2017 at 11:48:54PM +0000, Mark Brown wrote:
> > On Fri, Feb 17, 2017 at 12:28:44PM -0800, Nicolin Chen wrote:
> > > 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@perches.com>
> > > 
> > > For imx-audmux.c,
> > 
> > I don't have this patch, perhaps it got caught in a spam filter or
> > perhaps it got deleted because as ever you're not using subject lines
> > reflecting the style for the subsystem.
> 
> My bad that I didn't pay attention to the subject.
> 
> Joe, please fix it in v2. Thanks.
> 
> ASoC: Convert remaining uses of pr_warning to pr_warn

This is a treewide scripted patch which is
basically just a sed.

If or when you apply it, you should
fix it up to suit.

$ git log -1000 --pretty=oneline --no-merges sound/soc | \
  cut -f2- -d" " | cut -f1 -d":" |sort | uniq
ALSA
AsoC
ASoc
ASoC
ASOC
ASoC fix up SND_SOC_WM8985 dependency
drm/i915/dp
kthread
lib/vsprintf.c
scripts/spelling.txt
sgtl5000
SoC
sound/soc
treewide
Mark Brown Feb. 20, 2017, 7:06 p.m. UTC | #5
On Fri, Feb 17, 2017 at 04:20:47PM -0800, Joe Perches wrote:

> If or when you apply it, you should
> fix it up to suit.

To repeat, I don't have this patch so someone will need to send it to
me.

> $ git log -1000 --pretty=oneline --no-merges sound/soc | \
>   cut -f2- -d" " | cut -f1 -d":" |sort | uniq
> ALSA
> AsoC
> ASoc
> ASoC
> ASOC
> ASoC fix up SND_SOC_WM8985 dependency

*sigh*  Now try counting the frequency of each...

Patch
diff mbox

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;