ASoC: omap-mcbsp: Code cleanup in omap_mcbsp_dai_hw_params

[lisovros/linux_canprio.git] / sound / soc / omap / omap-mcbsp.c

diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index 88ca71c57c2bc787b92a41969eab0ff28b5bacb2..4ac8a08db7b5a3d7056777863c028615bf181db4 100644 (file)
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -367,18 +367,9 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
        } else if (cpu_is_omap343x()) {
                dma = omap24xx_dma_reqs[bus_id][substream->stream];
                port = omap34xx_mcbsp_port[bus_id][substream->stream];
-               dma_data->set_threshold = omap_mcbsp_set_threshold;
-               /* TODO: Currently, MODE_ELEMENT == MODE_FRAME */
-               if (omap_mcbsp_get_dma_op_mode(bus_id) ==
-                                               MCBSP_DMA_MODE_THRESHOLD)
-                       sync_mode = OMAP_DMA_SYNC_FRAME;
        } else {
                return -ENODEV;
        }
-       dma_data->name = substream->stream ? "Audio Capture" : "Audio Playback";
-       dma_data->dma_req = dma;
-       dma_data->port_addr = port;
-       dma_data->sync_mode = sync_mode;
        switch (params_format(params)) {
        case SNDRV_PCM_FORMAT_S16_LE:
                dma_data->data_type = OMAP_DMA_DATA_TYPE_S16;
@@ -389,6 +380,18 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
        default:
                return -EINVAL;
        }
+       if (cpu_is_omap343x()) {
+               dma_data->set_threshold = omap_mcbsp_set_threshold;
+               /* TODO: Currently, MODE_ELEMENT == MODE_FRAME */
+               if (omap_mcbsp_get_dma_op_mode(bus_id) ==
+                                               MCBSP_DMA_MODE_THRESHOLD)
+                       sync_mode = OMAP_DMA_SYNC_FRAME;
+       }
+
+       dma_data->name = substream->stream ? "Audio Capture" : "Audio Playback";
+       dma_data->dma_req = dma;
+       dma_data->port_addr = port;
+       dma_data->sync_mode = sync_mode;
 
        snd_soc_dai_set_dma_data(cpu_dai, substream, dma_data);