public inbox for kernel-janitors@vger.kernel.org
 help / color / mirror / Atom feed
* [patch] ASoC: compress: indent an if statement
@ 2014-05-14 14:23 Dan Carpenter
  2014-05-14 14:48 ` Takashi Iwai
  2014-05-14 15:15 ` Mark Brown
  0 siblings, 2 replies; 4+ messages in thread
From: Dan Carpenter @ 2014-05-14 14:23 UTC (permalink / raw)
  To: Vinod Koul
  Cc: Liam Girdwood, Mark Brown, Jaroslav Kysela, Takashi Iwai,
	alsa-devel, kernel-janitors

The return statement was not indented correctly.  I lined up the
condition a bit as well.

Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
index 91083e6..e4c7ad5 100644
--- a/sound/soc/soc-compress.c
+++ b/sound/soc/soc-compress.c
@@ -317,8 +317,9 @@ static int soc_compr_trigger_fe(struct snd_compr_stream *cstream, int cmd)
 		cmd = SND_COMPR_TRIGGER_DRAIN) {
 
 		if (platform->driver->compr_ops &&
-			platform->driver->compr_ops->trigger)
-		return platform->driver->compr_ops->trigger(cstream, cmd);
+		    platform->driver->compr_ops->trigger)
+			return platform->driver->compr_ops->trigger(cstream,
+								    cmd);
 	}
 
 	if (cstream->direction = SND_COMPRESS_PLAYBACK)

^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [patch] ASoC: compress: indent an if statement
  2014-05-14 14:23 [patch] ASoC: compress: indent an if statement Dan Carpenter
@ 2014-05-14 14:48 ` Takashi Iwai
  2014-05-14 15:19   ` Takashi Iwai
  2014-05-14 15:15 ` Mark Brown
  1 sibling, 1 reply; 4+ messages in thread
From: Takashi Iwai @ 2014-05-14 14:48 UTC (permalink / raw)
  To: Dan Carpenter
  Cc: Vinod Koul, Liam Girdwood, Mark Brown, Jaroslav Kysela,
	alsa-devel, kernel-janitors

At Wed, 14 May 2014 17:23:08 +0300,
Dan Carpenter wrote:
> 
> The return statement was not indented correctly.  I lined up the
> condition a bit as well.
> 
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>

Applied this one, too.  Thanks.


Takashi

> 
> diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
> index 91083e6..e4c7ad5 100644
> --- a/sound/soc/soc-compress.c
> +++ b/sound/soc/soc-compress.c
> @@ -317,8 +317,9 @@ static int soc_compr_trigger_fe(struct snd_compr_stream *cstream, int cmd)
>  		cmd = SND_COMPR_TRIGGER_DRAIN) {
>  
>  		if (platform->driver->compr_ops &&
> -			platform->driver->compr_ops->trigger)
> -		return platform->driver->compr_ops->trigger(cstream, cmd);
> +		    platform->driver->compr_ops->trigger)
> +			return platform->driver->compr_ops->trigger(cstream,
> +								    cmd);
>  	}
>  
>  	if (cstream->direction = SND_COMPRESS_PLAYBACK)
> 

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [patch] ASoC: compress: indent an if statement
  2014-05-14 14:23 [patch] ASoC: compress: indent an if statement Dan Carpenter
  2014-05-14 14:48 ` Takashi Iwai
@ 2014-05-14 15:15 ` Mark Brown
  1 sibling, 0 replies; 4+ messages in thread
From: Mark Brown @ 2014-05-14 15:15 UTC (permalink / raw)
  To: Dan Carpenter
  Cc: Vinod Koul, Liam Girdwood, Jaroslav Kysela, Takashi Iwai,
	alsa-devel, kernel-janitors

[-- Attachment #1: Type: text/plain, Size: 175 bytes --]

On Wed, May 14, 2014 at 05:23:08PM +0300, Dan Carpenter wrote:
> The return statement was not indented correctly.  I lined up the
> condition a bit as well.

Applied, thanks.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [patch] ASoC: compress: indent an if statement
  2014-05-14 14:48 ` Takashi Iwai
@ 2014-05-14 15:19   ` Takashi Iwai
  0 siblings, 0 replies; 4+ messages in thread
From: Takashi Iwai @ 2014-05-14 15:19 UTC (permalink / raw)
  To: Takashi Iwai
  Cc: Dan Carpenter, Vinod Koul, Liam Girdwood, Mark Brown,
	Jaroslav Kysela, alsa-devel, kernel-janitors

At Wed, 14 May 2014 16:48:11 +0200,
Takashi Iwai wrote:
> 
> At Wed, 14 May 2014 17:23:08 +0300,
> Dan Carpenter wrote:
> > 
> > The return statement was not indented correctly.  I lined up the
> > condition a bit as well.
> > 
> > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> 
> Applied this one, too.  Thanks.

Oops, I took it mistakenly.  Scratched from my branch now.
Sorry for confusion.


Takashi

> 
> 
> Takashi
> 
> > 
> > diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
> > index 91083e6..e4c7ad5 100644
> > --- a/sound/soc/soc-compress.c
> > +++ b/sound/soc/soc-compress.c
> > @@ -317,8 +317,9 @@ static int soc_compr_trigger_fe(struct snd_compr_stream *cstream, int cmd)
> >  		cmd = SND_COMPR_TRIGGER_DRAIN) {
> >  
> >  		if (platform->driver->compr_ops &&
> > -			platform->driver->compr_ops->trigger)
> > -		return platform->driver->compr_ops->trigger(cstream, cmd);
> > +		    platform->driver->compr_ops->trigger)
> > +			return platform->driver->compr_ops->trigger(cstream,
> > +								    cmd);
> >  	}
> >  
> >  	if (cstream->direction = SND_COMPRESS_PLAYBACK)
> > 

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2014-05-14 15:19 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-14 14:23 [patch] ASoC: compress: indent an if statement Dan Carpenter
2014-05-14 14:48 ` Takashi Iwai
2014-05-14 15:19   ` Takashi Iwai
2014-05-14 15:15 ` Mark Brown

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox