diff options
author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-03-15 06:29:49 -0400 |
---|---|---|
committer | Liam Girdwood <lrg@ti.com> | 2012-05-22 12:33:19 -0400 |
commit | 09fa37ac8f8be7cf57f24cfd5291c591b79957f1 (patch) | |
tree | f63d86aeb6953ce50fcdab885b49f0f1f8181aae /sound | |
parent | 778a17c31fc1c0ecc22c9012747d5249ed6db80f (diff) |
ASoC: omap-mcbsp: Remove unused FRAME dma_op_mode
The frame dma_op_mode has never been used, and it is just creating
confusion for users/developers.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com>
Signed-off-by: Liam Girdwood <lrg@ti.com>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/omap/mcbsp.c | 2 | ||||
-rw-r--r-- | sound/soc/omap/mcbsp.h | 1 | ||||
-rw-r--r-- | sound/soc/omap/omap-mcbsp.c | 1 |
3 files changed, 1 insertions, 3 deletions
diff --git a/sound/soc/omap/mcbsp.c b/sound/soc/omap/mcbsp.c index e5f44440d1b9..ec6832cc296d 100644 --- a/sound/soc/omap/mcbsp.c +++ b/sound/soc/omap/mcbsp.c | |||
@@ -754,7 +754,7 @@ THRESHOLD_PROP_BUILDER(max_tx_thres); | |||
754 | THRESHOLD_PROP_BUILDER(max_rx_thres); | 754 | THRESHOLD_PROP_BUILDER(max_rx_thres); |
755 | 755 | ||
756 | static const char *dma_op_modes[] = { | 756 | static const char *dma_op_modes[] = { |
757 | "element", "threshold", "frame", | 757 | "element", "threshold", |
758 | }; | 758 | }; |
759 | 759 | ||
760 | static ssize_t dma_op_mode_show(struct device *dev, | 760 | static ssize_t dma_op_mode_show(struct device *dev, |
diff --git a/sound/soc/omap/mcbsp.h b/sound/soc/omap/mcbsp.h index a944fcc9073c..179a822c7238 100644 --- a/sound/soc/omap/mcbsp.h +++ b/sound/soc/omap/mcbsp.h | |||
@@ -217,7 +217,6 @@ enum { | |||
217 | /********************** McBSP DMA operating modes **************************/ | 217 | /********************** McBSP DMA operating modes **************************/ |
218 | #define MCBSP_DMA_MODE_ELEMENT 0 | 218 | #define MCBSP_DMA_MODE_ELEMENT 0 |
219 | #define MCBSP_DMA_MODE_THRESHOLD 1 | 219 | #define MCBSP_DMA_MODE_THRESHOLD 1 |
220 | #define MCBSP_DMA_MODE_FRAME 2 | ||
221 | 220 | ||
222 | /********************** McBSP WAKEUPEN bit definitions *********************/ | 221 | /********************** McBSP WAKEUPEN bit definitions *********************/ |
223 | #define RSYNCERREN BIT(0) | 222 | #define RSYNCERREN BIT(0) |
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c index 418dc3cebdec..27144a67e5ec 100644 --- a/sound/soc/omap/omap-mcbsp.c +++ b/sound/soc/omap/omap-mcbsp.c | |||
@@ -245,7 +245,6 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream, | |||
245 | } | 245 | } |
246 | if (mcbsp->pdata->buffer_size) { | 246 | if (mcbsp->pdata->buffer_size) { |
247 | dma_data->set_threshold = omap_mcbsp_set_threshold; | 247 | dma_data->set_threshold = omap_mcbsp_set_threshold; |
248 | /* TODO: Currently, MODE_ELEMENT == MODE_FRAME */ | ||
249 | if (mcbsp->dma_op_mode == MCBSP_DMA_MODE_THRESHOLD) { | 248 | if (mcbsp->dma_op_mode == MCBSP_DMA_MODE_THRESHOLD) { |
250 | int period_words, max_thrsh; | 249 | int period_words, max_thrsh; |
251 | 250 | ||