ASoC: OMAP: Remove sync_mode from omap_pcm_dma_data struct

The omap-pcm platform driver no longer needs this parameter to select
between ELEMENT and PACKET mode. The selection is based on the configured
packet_size.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Tested-by: Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

5 files changed, 1 insertions, 9 deletions

diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/omap/omap-dmic.c
index 75f5dca0e8d2..60b7b8cd1c7d 100644
--- a/sound/soc/omap/omap-dmic.c
+++ b/sound/soc/omap/omap-dmic.c
@@ -64,7 +64,6 @@ struct omap_dmic {
 static struct omap_pcm_dma_data omap_dmic_dai_dma_params = {
         .name           = "DMIC capture",
         .data_type      = OMAP_DMA_DATA_TYPE_S32,
-        .sync_mode      = OMAP_DMA_SYNC_PACKET,
 };
 
 static inline void omap_dmic_write(struct omap_dmic *dmic, u16 reg, u32 val)
diff --git a/sound/soc/omap/omap-hdmi.c b/sound/soc/omap/omap-hdmi.c
index a08245d9203c..b19464697ac8 100644
--- a/sound/soc/omap/omap-hdmi.c
+++ b/sound/soc/omap/omap-hdmi.c
@@ -290,7 +290,6 @@ static __devinit int omap_hdmi_probe(struct platform_device *pdev)
 
         hdmi_data->dma_params.dma_req =  hdmi_rsrc->start;
         hdmi_data->dma_params.name = "HDMI playback";
-        hdmi_data->dma_params.sync_mode = OMAP_DMA_SYNC_PACKET;
 
         /*
          * TODO: We assume that there is only one DSS HDMI device. Future
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index fe3debcc2d0b..5b3baccd74c3 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -225,7 +225,7 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
         struct omap_mcbsp *mcbsp = snd_soc_dai_get_drvdata(cpu_dai);
         struct omap_mcbsp_reg_cfg *regs = &mcbsp->cfg_regs;
         struct omap_pcm_dma_data *dma_data;
-        int wlen, channels, wpf, sync_mode = OMAP_DMA_SYNC_ELEMENT;
+        int wlen, channels, wpf;
         int pkt_size = 0;
         unsigned int format, div, framesize, master;
 
@@ -272,15 +272,12 @@ static int omap_mcbsp_dai_hw_params(struct snd_pcm_substream *substream,
                                 return -EINVAL;
 
                         pkt_size = period_words / divider;
-                        sync_mode = OMAP_DMA_SYNC_PACKET;
                 } else if (channels > 1) {
                         /* Use packet mode for non mono streams */
                         pkt_size = channels;
-                        sync_mode = OMAP_DMA_SYNC_PACKET;
                 }
         }
 
-        dma_data->sync_mode = sync_mode;
         dma_data->packet_size = pkt_size;
 
         snd_soc_dai_set_dma_data(cpu_dai, substream, dma_data);
diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/omap/omap-mcpdm.c
index f7babb374a37..baf92da42aec 100644
--- a/sound/soc/omap/omap-mcpdm.c
+++ b/sound/soc/omap/omap-mcpdm.c
@@ -73,14 +73,12 @@ static struct omap_pcm_dma_data omap_mcpdm_dai_dma_params[] = {
                 .name = "Audio playback",
                 .dma_req = OMAP44XX_DMA_MCPDM_DL,
                 .data_type = OMAP_DMA_DATA_TYPE_S32,
-                .sync_mode = OMAP_DMA_SYNC_PACKET,
                 .port_addr = OMAP44XX_MCPDM_L3_BASE + MCPDM_REG_DN_DATA,
         },
         {
                 .name = "Audio capture",
                 .dma_req = OMAP44XX_DMA_MCPDM_UP,
                 .data_type = OMAP_DMA_DATA_TYPE_S32,
-                .sync_mode = OMAP_DMA_SYNC_PACKET,
                 .port_addr = OMAP44XX_MCPDM_L3_BASE + MCPDM_REG_UP_DATA,
         },
 };
diff --git a/sound/soc/omap/omap-pcm.h b/sound/soc/omap/omap-pcm.h
index b92248cbd47a..1bf47e4b60c2 100644
--- a/sound/soc/omap/omap-pcm.h
+++ b/sound/soc/omap/omap-pcm.h
@@ -33,7 +33,6 @@ struct omap_pcm_dma_data {
         unsigned long   port_addr;      /* transmit/receive register */
         void (*set_threshold)(struct snd_pcm_substream *substream);
         int             data_type;      /* data type 8,16,32 */
-        int             sync_mode;      /* DMA sync mode */
         int             packet_size;    /* packet size only in PACKET mode */
 };