[PATCH] ASoC: Samsung: Merge two identical if-else clauses

[PATCH] ASoC: Samsung: Merge two identical if-else clauses

[Jassi Brar]

Saves two lines and a hell of a lot of embarrassment looking at the code.

Signed-off-by: Jassi Brar <jaswinder.singh@linaro.org>
---
 sound/soc/samsung/i2s.c |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index 7ccb075..6553b19 100644
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -761,15 +761,13 @@ static int i2s_trigger(struct snd_pcm_substream *substream,
 	case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
 		local_irq_save(flags);
 
-		if (capture)
+		if (capture) {
 			i2s_rxctrl(i2s, 0);
-		else
-			i2s_txctrl(i2s, 0);
-
-		if (capture)
 			i2s_fifo(i2s, FIC_RXFLUSH);
-		else
+		} else {
+			i2s_txctrl(i2s, 0);
 			i2s_fifo(i2s, FIC_TXFLUSH);
+		}
 
 		local_irq_restore(flags);
 		break;
-- 
1.7.4.1

Re: [PATCH] ASoC: Samsung: Merge two identical if-else clauses

[Mark Brown]

[-- Attachment #1.1: Type: text/plain, Size: 154 bytes --]

On Sat, Feb 25, 2012 at 04:42:34PM +0530, Jassi Brar wrote:
> Saves two lines and a hell of a lot of embarrassment looking at the code.

Applied, thanks.

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

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]