ALSA: atmel: ac97: clarify operator precedence

[sfrench/cifs-2.6.git] / sound / atmel / ac97c.c

diff --git a/sound/atmel/ac97c.c b/sound/atmel/ac97c.c
index a1dce9725b98e48442f44bef421fc1ac62f12d76..66ecbd4d034e805263359760aa7796893b4649cd 100644 (file)
--- a/sound/atmel/ac97c.c
+++ b/sound/atmel/ac97c.c
@@ -219,7 +219,7 @@ static int atmel_ac97c_playback_prepare(struct snd_pcm_substream *substream)
        switch (runtime->format) {
        case SNDRV_PCM_FORMAT_S16_LE:
                break;
-       case SNDRV_PCM_FORMAT_S16_BE: /* fall through */
+       case SNDRV_PCM_FORMAT_S16_BE:
                word &= ~(AC97C_CMR_CEM_LITTLE);
                break;
        default:
@@ -301,7 +301,7 @@ static int atmel_ac97c_capture_prepare(struct snd_pcm_substream *substream)
        switch (runtime->format) {
        case SNDRV_PCM_FORMAT_S16_LE:
                break;
-       case SNDRV_PCM_FORMAT_S16_BE: /* fall through */
+       case SNDRV_PCM_FORMAT_S16_BE:
                word &= ~(AC97C_CMR_CEM_LITTLE);
                break;
        default:
@@ -356,14 +356,14 @@ atmel_ac97c_playback_trigger(struct snd_pcm_substream *substream, int cmd)
        camr = ac97c_readl(chip, CAMR);
 
        switch (cmd) {
-       case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: /* fall through */
-       case SNDRV_PCM_TRIGGER_RESUME: /* fall through */
+       case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
+       case SNDRV_PCM_TRIGGER_RESUME:
        case SNDRV_PCM_TRIGGER_START:
                ptcr = ATMEL_PDC_TXTEN;
                camr |= AC97C_CMR_CENA | AC97C_CSR_ENDTX;
                break;
-       case SNDRV_PCM_TRIGGER_PAUSE_PUSH: /* fall through */
-       case SNDRV_PCM_TRIGGER_SUSPEND: /* fall through */
+       case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
+       case SNDRV_PCM_TRIGGER_SUSPEND:
        case SNDRV_PCM_TRIGGER_STOP:
                ptcr |= ATMEL_PDC_TXTDIS;
                if (chip->opened <= 1)
@@ -388,14 +388,14 @@ atmel_ac97c_capture_trigger(struct snd_pcm_substream *substream, int cmd)
        ptcr = readl(chip->regs + ATMEL_PDC_PTSR);
 
        switch (cmd) {
-       case SNDRV_PCM_TRIGGER_PAUSE_RELEASE: /* fall through */
-       case SNDRV_PCM_TRIGGER_RESUME: /* fall through */
+       case SNDRV_PCM_TRIGGER_PAUSE_RELEASE:
+       case SNDRV_PCM_TRIGGER_RESUME:
        case SNDRV_PCM_TRIGGER_START:
                ptcr = ATMEL_PDC_RXTEN;
                camr |= AC97C_CMR_CENA | AC97C_CSR_ENDRX;
                break;
-       case SNDRV_PCM_TRIGGER_PAUSE_PUSH: /* fall through */
-       case SNDRV_PCM_TRIGGER_SUSPEND: /* fall through */
+       case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
+       case SNDRV_PCM_TRIGGER_SUSPEND:
        case SNDRV_PCM_TRIGGER_STOP:
                ptcr |= ATMEL_PDC_RXTDIS;
                if (chip->opened <= 1)
@@ -475,12 +475,12 @@ static irqreturn_t atmel_ac97c_interrupt(int irq, void *dev)
                struct snd_pcm_runtime *runtime;
                int offset, next_period, block_size;
                dev_dbg(&chip->pdev->dev, "channel A event%s%s%s%s%s%s\n",
-                               casr & AC97C_CSR_OVRUN   ? " OVRUN"   : "",
-                               casr & AC97C_CSR_RXRDY   ? " RXRDY"   : "",
-                               casr & AC97C_CSR_UNRUN   ? " UNRUN"   : "",
-                               casr & AC97C_CSR_TXEMPTY ? " TXEMPTY" : "",
-                               casr & AC97C_CSR_TXRDY   ? " TXRDY"   : "",
-                               !casr                    ? " NONE"    : "");
+                       (casr & AC97C_CSR_OVRUN)   ? " OVRUN"   : "",
+                       (casr & AC97C_CSR_RXRDY)   ? " RXRDY"   : "",
+                       (casr & AC97C_CSR_UNRUN)   ? " UNRUN"   : "",
+                       (casr & AC97C_CSR_TXEMPTY) ? " TXEMPTY" : "",
+                       (casr & AC97C_CSR_TXRDY)   ? " TXRDY"   : "",
+                       !casr                      ? " NONE"    : "");
                if ((casr & camr) & AC97C_CSR_ENDTX) {
                        runtime = chip->playback_substream->runtime;
                        block_size = frames_to_bytes(runtime, runtime->period_size);
@@ -521,11 +521,11 @@ static irqreturn_t atmel_ac97c_interrupt(int irq, void *dev)
 
        if (sr & AC97C_SR_COEVT) {
                dev_info(&chip->pdev->dev, "codec channel event%s%s%s%s%s\n",
-                               cosr & AC97C_CSR_OVRUN   ? " OVRUN"   : "",
-                               cosr & AC97C_CSR_RXRDY   ? " RXRDY"   : "",
-                               cosr & AC97C_CSR_TXEMPTY ? " TXEMPTY" : "",
-                               cosr & AC97C_CSR_TXRDY   ? " TXRDY"   : "",
-                               !cosr                    ? " NONE"    : "");
+                        (cosr & AC97C_CSR_OVRUN)   ? " OVRUN"   : "",
+                        (cosr & AC97C_CSR_RXRDY)   ? " RXRDY"   : "",
+                        (cosr & AC97C_CSR_TXEMPTY) ? " TXEMPTY" : "",
+                        (cosr & AC97C_CSR_TXRDY)   ? " TXRDY"   : "",
+                        !cosr                      ? " NONE"    : "");
                retval = IRQ_HANDLED;
        }