From f16fd7943380004b282a50cfb809ed09c5be8025 Mon Sep 17 00:00:00 2001
From: Peter Ujfalusi <peter.ujfalusi@ti.com>
Date: Thu, 15 Mar 2012 12:29:49 +0200
Subject: [PATCH] --- yaml --- r: 307994 b: refs/heads/master c:
 09fa37ac8f8be7cf57f24cfd5291c591b79957f1 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/sound/soc/omap/mcbsp.c      | 2 +-
 trunk/sound/soc/omap/mcbsp.h      | 1 -
 trunk/sound/soc/omap/omap-mcbsp.c | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 98d322975bb9..f7e049cb5bf4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 778a17c31fc1c0ecc22c9012747d5249ed6db80f
+refs/heads/master: 09fa37ac8f8be7cf57f24cfd5291c591b79957f1
diff --git a/trunk/sound/soc/omap/mcbsp.c b/trunk/sound/soc/omap/mcbsp.c
index e5f44440d1b9..ec6832cc296d 100644
--- a/trunk/sound/soc/omap/mcbsp.c
+++ b/trunk/sound/soc/omap/mcbsp.c
@@ -754,7 +754,7 @@ THRESHOLD_PROP_BUILDER(max_tx_thres);
 THRESHOLD_PROP_BUILDER(max_rx_thres);
 
 static const char *dma_op_modes[] = {
-	"element", "threshold", "frame",
+	"element", "threshold",
 };
 
 static ssize_t dma_op_mode_show(struct device *dev,
diff --git a/trunk/sound/soc/omap/mcbsp.h b/trunk/sound/soc/omap/mcbsp.h
index a944fcc9073c..179a822c7238 100644
--- a/trunk/sound/soc/omap/mcbsp.h
+++ b/trunk/sound/soc/omap/mcbsp.h
@@ -217,7 +217,6 @@ enum {
 /********************** McBSP DMA operating modes **************************/
 #define MCBSP_DMA_MODE_ELEMENT		0
 #define MCBSP_DMA_MODE_THRESHOLD	1
-#define MCBSP_DMA_MODE_FRAME		2
 
 /********************** McBSP WAKEUPEN bit definitions *********************/
 #define RSYNCERREN		BIT(0)
diff --git a/trunk/sound/soc/omap/omap-mcbsp.c b/trunk/sound/soc/omap/omap-mcbsp.c
index 418dc3cebdec..27144a67e5ec 100644
--- a/trunk/sound/soc/omap/omap-mcbsp.c
+++ b/trunk/sound/soc/omap/omap-mcbsp.c
@@ -245,7 +245,6 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
 	}
 	if (mcbsp->pdata->buffer_size) {
 		dma_data->set_threshold = omap_mcbsp_set_threshold;
-		/* TODO: Currently, MODE_ELEMENT == MODE_FRAME */
 		if (mcbsp->dma_op_mode == MCBSP_DMA_MODE_THRESHOLD) {
 			int period_words, max_thrsh;