summary refs log tree commit diff
path: root/sound/soc/imx
diff options
context:
space:
mode:
authorWolfram Sang <w.sang@pengutronix.de>2011-03-25 16:51:46 +0100
committerMark Brown <broonie@opensource.wolfsonmicro.com>2011-03-26 17:43:54 +0000
commit8b573c95d7bd1cf28c69ab4e0255cd272d214482 (patch)
treecbb24d357d6815923b5cf884ebd904b8c1478d4e /sound/soc/imx
parenta0b1550677a4449a57a32ebc167cba552da9871e (diff)
downloadlinux-8b573c95d7bd1cf28c69ab4e0255cd272d214482.tar.gz
ASoC: imx: remove superfluous code in imx-ssi.c
Checking if IMX_SSI_DMA is set and then set it again is useless.

Signed-off-by: Wolfram Sang <w.sang@pengutronix.de>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/imx')
-rw-r--r--sound/soc/imx/imx-ssi.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/sound/soc/imx/imx-ssi.c b/sound/soc/imx/imx-ssi.c
index bc92ec620004..c331d65587d8 100644
--- a/sound/soc/imx/imx-ssi.c
+++ b/sound/soc/imx/imx-ssi.c
@@ -667,12 +667,6 @@ static int imx_ssi_probe(struct platform_device *pdev)
 	if (res)
 		ssi->dma_params_rx.dma = res->start;
 
-	if ((cpu_is_mx27() || cpu_is_mx21()) &&
-			!(ssi->flags & IMX_SSI_USE_AC97) &&
-			(ssi->flags & IMX_SSI_DMA)) {
-		ssi->flags |= IMX_SSI_DMA;
-	}
-
 	platform_set_drvdata(pdev, ssi);
 
 	ret = snd_soc_register_dai(&pdev->dev, dai);