ASoC: ux500: remove platform_data support

[sfrench/cifs-2.6.git] / sound / soc / ux500 / ux500_pcm.c

diff --git a/sound/soc/ux500/ux500_pcm.c b/sound/soc/ux500/ux500_pcm.c
index d3802e5ef196e0e66fe3bc7c15fd39a549f10369..ca87517d80c9f6f0b2eac33ad47a42a35ec8383b 100644 (file)
--- a/sound/soc/ux500/ux500_pcm.c
+++ b/sound/soc/ux500/ux500_pcm.c
@@ -29,18 +29,6 @@
 #define UX500_PLATFORM_PERIODS_MAX             48
 #define UX500_PLATFORM_BUFFER_BYTES_MAX                (2048 * PAGE_SIZE)
 
-static const struct snd_pcm_hardware ux500_pcm_hw = {
-       .info = SNDRV_PCM_INFO_INTERLEAVED |
-               SNDRV_PCM_INFO_MMAP |
-               SNDRV_PCM_INFO_RESUME |
-               SNDRV_PCM_INFO_PAUSE,
-       .buffer_bytes_max = UX500_PLATFORM_BUFFER_BYTES_MAX,
-       .period_bytes_min = UX500_PLATFORM_PERIODS_BYTES_MIN,
-       .period_bytes_max = UX500_PLATFORM_PERIODS_BYTES_MAX,
-       .periods_min = UX500_PLATFORM_PERIODS_MIN,
-       .periods_max = UX500_PLATFORM_PERIODS_MAX,
-};
-
 static struct dma_chan *ux500_pcm_request_chan(struct snd_soc_pcm_runtime *rtd,
        struct snd_pcm_substream *substream)
 {
@@ -84,21 +72,12 @@ static int ux500_pcm_prepare_slave_config(struct snd_pcm_substream *substream,
                struct dma_slave_config *slave_config)
 {
        struct snd_soc_pcm_runtime *rtd = asoc_substream_to_rtd(substream);
-       struct msp_i2s_platform_data *pdata = asoc_rtd_to_cpu(rtd, 0)->dev->platform_data;
        struct snd_dmaengine_dai_dma_data *snd_dma_params;
-       struct ux500_msp_dma_params *ste_dma_params;
        dma_addr_t dma_addr;
        int ret;
 
-       if (pdata) {
-               ste_dma_params =
-                       snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream);
-               dma_addr = ste_dma_params->tx_rx_addr;
-       } else {
-               snd_dma_params =
-                       snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream);
-               dma_addr = snd_dma_params->addr;
-       }
+       snd_dma_params = snd_soc_dai_get_dma_data(asoc_rtd_to_cpu(rtd, 0), substream);
+       dma_addr = snd_dma_params->addr;
 
        ret = snd_hwparams_to_dma_slave_config(substream, params, slave_config);
        if (ret)
@@ -118,13 +97,6 @@ static int ux500_pcm_prepare_slave_config(struct snd_pcm_substream *substream,
        return 0;
 }
 
-static const struct snd_dmaengine_pcm_config ux500_dmaengine_pcm_config = {
-       .pcm_hardware = &ux500_pcm_hw,
-       .compat_request_channel = ux500_pcm_request_chan,
-       .prealloc_buffer_size = 128 * 1024,
-       .prepare_slave_config = ux500_pcm_prepare_slave_config,
-};
-
 static const struct snd_dmaengine_pcm_config ux500_dmaengine_of_pcm_config = {
        .compat_request_channel = ux500_pcm_request_chan,
        .prepare_slave_config = ux500_pcm_prepare_slave_config,
@@ -132,16 +104,10 @@ static const struct snd_dmaengine_pcm_config ux500_dmaengine_of_pcm_config = {
 
 int ux500_pcm_register_platform(struct platform_device *pdev)
 {
-       const struct snd_dmaengine_pcm_config *pcm_config;
-       struct device_node *np = pdev->dev.of_node;
        int ret;
 
-       if (np)
-               pcm_config = &ux500_dmaengine_of_pcm_config;
-       else
-               pcm_config = &ux500_dmaengine_pcm_config;
-
-       ret = snd_dmaengine_pcm_register(&pdev->dev, pcm_config,
+       ret = snd_dmaengine_pcm_register(&pdev->dev,
+                                        &ux500_dmaengine_of_pcm_config,
                                         SND_DMAENGINE_PCM_FLAG_COMPAT);
        if (ret < 0) {
                dev_err(&pdev->dev,