[2/2] ASoC: compress: Fixup some minor style issues
diff mbox

Message ID 20180124135525.5633-2-ckeepax@opensource.cirrus.com
State New
Headers show

Commit Message

Charles Keepax Jan. 24, 2018, 1:55 p.m. UTC
Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
---
 sound/soc/soc-compress.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

Comments

Ladislav Michl Jan. 24, 2018, 2:33 p.m. UTC | #1
On Wed, Jan 24, 2018 at 01:55:25PM +0000, Charles Keepax wrote:
> Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
> ---
>  sound/soc/soc-compress.c | 4 +---
>  1 file changed, 1 insertion(+), 3 deletions(-)
> 
> diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
> index 34834c02dda8..7c1955e9533a 100644
> --- a/sound/soc/soc-compress.c
> +++ b/sound/soc/soc-compress.c
> @@ -262,7 +262,6 @@ static int soc_compr_free(struct snd_compr_stream *cstream)
>  	if (!codec_dai->active)
>  		codec_dai->rate = 0;
>  
> -
>  	if (rtd->dai_link->compr_ops && rtd->dai_link->compr_ops->shutdown)
>  		rtd->dai_link->compr_ops->shutdown(cstream);
>  
> @@ -401,7 +400,6 @@ static int soc_compr_trigger_fe(struct snd_compr_stream *cstream, int cmd)
>  	else
>  		stream = SNDRV_PCM_STREAM_CAPTURE;
>  
> -
>  	mutex_lock_nested(&fe->card->mutex, SND_SOC_CARD_CLASS_RUNTIME);
>  
>  	if (cpu_dai->driver->cops && cpu_dai->driver->cops->trigger) {
> @@ -859,7 +857,7 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num)
>  	rtd->compr = compr;
>  	compr->private_data = rtd;
>  
> -	printk(KERN_INFO "compress asoc: %s <-> %s mapping ok\n", codec_dai->name,
> +	pr_info("compress asoc: %s <-> %s mapping ok\n", codec_dai->name,
>  		cpu_dai->name);

What about:
	dev_info(rtd->card->dev, ...
or better drop this change and make separate patch fixing logging
soc-compress-wide?

>  	return ret;
>  
> -- 
> 2.11.0
> 
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Charles Keepax Jan. 24, 2018, 2:50 p.m. UTC | #2
On Wed, Jan 24, 2018 at 03:33:19PM +0100, Ladislav Michl wrote:
> On Wed, Jan 24, 2018 at 01:55:25PM +0000, Charles Keepax wrote:
> > Signed-off-by: Charles Keepax <ckeepax@opensource.cirrus.com>
> > ---
> >  sound/soc/soc-compress.c | 4 +---
> >  1 file changed, 1 insertion(+), 3 deletions(-)
> > 
> > diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
> > index 34834c02dda8..7c1955e9533a 100644
> > --- a/sound/soc/soc-compress.c
> > +++ b/sound/soc/soc-compress.c
> > @@ -262,7 +262,6 @@ static int soc_compr_free(struct snd_compr_stream *cstream)
> >  	if (!codec_dai->active)
> >  		codec_dai->rate = 0;
> >  
> > -
> >  	if (rtd->dai_link->compr_ops && rtd->dai_link->compr_ops->shutdown)
> >  		rtd->dai_link->compr_ops->shutdown(cstream);
> >  
> > @@ -401,7 +400,6 @@ static int soc_compr_trigger_fe(struct snd_compr_stream *cstream, int cmd)
> >  	else
> >  		stream = SNDRV_PCM_STREAM_CAPTURE;
> >  
> > -
> >  	mutex_lock_nested(&fe->card->mutex, SND_SOC_CARD_CLASS_RUNTIME);
> >  
> >  	if (cpu_dai->driver->cops && cpu_dai->driver->cops->trigger) {
> > @@ -859,7 +857,7 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num)
> >  	rtd->compr = compr;
> >  	compr->private_data = rtd;
> >  
> > -	printk(KERN_INFO "compress asoc: %s <-> %s mapping ok\n", codec_dai->name,
> > +	pr_info("compress asoc: %s <-> %s mapping ok\n", codec_dai->name,
> >  		cpu_dai->name);
> 
> What about:
> 	dev_info(rtd->card->dev, ...
> or better drop this change and make separate patch fixing logging
> soc-compress-wide?
> 

yes I had thought about doing that but then laziness got the
better of me :-)

Will perhaps split into a whitespace fix and update all the
logging to use dev_* unless anyone objects?

Thanks,
Charles

Patch
diff mbox

diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
index 34834c02dda8..7c1955e9533a 100644
--- a/sound/soc/soc-compress.c
+++ b/sound/soc/soc-compress.c
@@ -262,7 +262,6 @@  static int soc_compr_free(struct snd_compr_stream *cstream)
 	if (!codec_dai->active)
 		codec_dai->rate = 0;
 
-
 	if (rtd->dai_link->compr_ops && rtd->dai_link->compr_ops->shutdown)
 		rtd->dai_link->compr_ops->shutdown(cstream);
 
@@ -401,7 +400,6 @@  static int soc_compr_trigger_fe(struct snd_compr_stream *cstream, int cmd)
 	else
 		stream = SNDRV_PCM_STREAM_CAPTURE;
 
-
 	mutex_lock_nested(&fe->card->mutex, SND_SOC_CARD_CLASS_RUNTIME);
 
 	if (cpu_dai->driver->cops && cpu_dai->driver->cops->trigger) {
@@ -859,7 +857,7 @@  int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num)
 	rtd->compr = compr;
 	compr->private_data = rtd;
 
-	printk(KERN_INFO "compress asoc: %s <-> %s mapping ok\n", codec_dai->name,
+	pr_info("compress asoc: %s <-> %s mapping ok\n", codec_dai->name,
 		cpu_dai->name);
 	return ret;