1 files changed, 47 insertions, 101 deletions

diff --git a/sound/soc/pxa/pxa-ssp.c b/sound/soc/pxa/pxa-ssp.c
index a1fd23e0e3d0..99d80e85621c 100644
--- a/sound/soc/pxa/pxa-ssp.c
+++ b/sound/soc/pxa/pxa-ssp.c
@@ -108,11 +108,9 @@ pxa_ssp_get_dma_params(struct ssp_device *ssp, int width4, int out)
 }
 
 static int pxa_ssp_startup(struct snd_pcm_substream *substream,
-                           struct snd_soc_dai *dai)
+                           struct snd_soc_dai *cpu_dai)
 {
-        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
-        struct ssp_priv *priv = cpu_dai->private_data;
+        struct ssp_priv *priv = snd_soc_dai_get_drvdata(cpu_dai);
         struct ssp_device *ssp = priv->ssp;
         int ret = 0;
 
@@ -128,11 +126,9 @@ static int pxa_ssp_startup(struct snd_pcm_substream *substream,
 }
 
 static void pxa_ssp_shutdown(struct snd_pcm_substream *substream,
-                             struct snd_soc_dai *dai)
+                             struct snd_soc_dai *cpu_dai)
 {
-        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
-        struct ssp_priv *priv = cpu_dai->private_data;
+        struct ssp_priv *priv = snd_soc_dai_get_drvdata(cpu_dai);
         struct ssp_device *ssp = priv->ssp;
 
         if (!cpu_dai->active) {
@@ -148,7 +144,7 @@ static void pxa_ssp_shutdown(struct snd_pcm_substream *substream,
 
 static int pxa_ssp_suspend(struct snd_soc_dai *cpu_dai)
 {
-        struct ssp_priv *priv = cpu_dai->private_data;
+        struct ssp_priv *priv = snd_soc_dai_get_drvdata(cpu_dai);
         struct ssp_device *ssp = priv->ssp;
 
         if (!cpu_dai->active)
@@ -166,7 +162,7 @@ static int pxa_ssp_suspend(struct snd_soc_dai *cpu_dai)
 
 static int pxa_ssp_resume(struct snd_soc_dai *cpu_dai)
 {
-        struct ssp_priv *priv = cpu_dai->private_data;
+        struct ssp_priv *priv = snd_soc_dai_get_drvdata(cpu_dai);
         struct ssp_device *ssp = priv->ssp;
         uint32_t sssr = SSSR_ROR | SSSR_TUR | SSSR_BCE;
 
@@ -230,7 +226,7 @@ static u32 pxa_ssp_get_scr(struct ssp_device *ssp)
 static int pxa_ssp_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
         int clk_id, unsigned int freq, int dir)
 {
-        struct ssp_priv *priv = cpu_dai->private_data;
+        struct ssp_priv *priv = snd_soc_dai_get_drvdata(cpu_dai);
         struct ssp_device *ssp = priv->ssp;
         int val;
 
@@ -287,7 +283,7 @@ static int pxa_ssp_set_dai_sysclk(struct snd_soc_dai *cpu_dai,
 static int pxa_ssp_set_dai_clkdiv(struct snd_soc_dai *cpu_dai,
         int div_id, int div)
 {
-        struct ssp_priv *priv = cpu_dai->private_data;
+        struct ssp_priv *priv = snd_soc_dai_get_drvdata(cpu_dai);
         struct ssp_device *ssp = priv->ssp;
         int val;
 
@@ -338,7 +334,7 @@ static int pxa_ssp_set_dai_clkdiv(struct snd_soc_dai *cpu_dai,
 static int pxa_ssp_set_dai_pll(struct snd_soc_dai *cpu_dai, int pll_id,
         int source, unsigned int freq_in, unsigned int freq_out)
 {
-        struct ssp_priv *priv = cpu_dai->private_data;
+        struct ssp_priv *priv = snd_soc_dai_get_drvdata(cpu_dai);
         struct ssp_device *ssp = priv->ssp;
         u32 ssacd = pxa_ssp_read_reg(ssp, SSACD) & ~0x70;
 
@@ -407,7 +403,7 @@ static int pxa_ssp_set_dai_pll(struct snd_soc_dai *cpu_dai, int pll_id,
 static int pxa_ssp_set_dai_tdm_slot(struct snd_soc_dai *cpu_dai,
         unsigned int tx_mask, unsigned int rx_mask, int slots, int slot_width)
 {
-        struct ssp_priv *priv = cpu_dai->private_data;
+        struct ssp_priv *priv = snd_soc_dai_get_drvdata(cpu_dai);
         struct ssp_device *ssp = priv->ssp;
         u32 sscr0;
 
@@ -442,7 +438,7 @@ static int pxa_ssp_set_dai_tdm_slot(struct snd_soc_dai *cpu_dai,
 static int pxa_ssp_set_dai_tristate(struct snd_soc_dai *cpu_dai,
         int tristate)
 {
-        struct ssp_priv *priv = cpu_dai->private_data;
+        struct ssp_priv *priv = snd_soc_dai_get_drvdata(cpu_dai);
         struct ssp_device *ssp = priv->ssp;
         u32 sscr1;
 
@@ -464,7 +460,7 @@ static int pxa_ssp_set_dai_tristate(struct snd_soc_dai *cpu_dai,
 static int pxa_ssp_set_dai_fmt(struct snd_soc_dai *cpu_dai,
                 unsigned int fmt)
 {
-        struct ssp_priv *priv = cpu_dai->private_data;
+        struct ssp_priv *priv = snd_soc_dai_get_drvdata(cpu_dai);
         struct ssp_device *ssp = priv->ssp;
         u32 sscr0;
         u32 sscr1;
@@ -555,11 +551,9 @@ static int pxa_ssp_set_dai_fmt(struct snd_soc_dai *cpu_dai,
  */
 static int pxa_ssp_hw_params(struct snd_pcm_substream *substream,
                                 struct snd_pcm_hw_params *params,
-                                struct snd_soc_dai *dai)
+                                struct snd_soc_dai *cpu_dai)
 {
-        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
-        struct ssp_priv *priv = cpu_dai->private_data;
+        struct ssp_priv *priv = snd_soc_dai_get_drvdata(cpu_dai);
         struct ssp_device *ssp = priv->ssp;
         int chn = params_channels(params);
         u32 sscr0;
@@ -568,7 +562,7 @@ static int pxa_ssp_hw_params(struct snd_pcm_substream *substream,
         int ttsa = pxa_ssp_read_reg(ssp, SSTSA) & 0xf;
         struct pxa2xx_pcm_dma_params *dma_data;
 
-        dma_data = snd_soc_dai_get_dma_data(dai, substream);
+        dma_data = snd_soc_dai_get_dma_data(cpu_dai, substream);
 
         /* generate correct DMA params */
         kfree(dma_data);
@@ -581,7 +575,7 @@ static int pxa_ssp_hw_params(struct snd_pcm_substream *substream,
                         ((chn == 2) && (ttsa != 1)) || (width == 32),
                         substream->stream == SNDRV_PCM_STREAM_PLAYBACK);
 
-        snd_soc_dai_set_dma_data(dai, substream, dma_data);
+        snd_soc_dai_set_dma_data(cpu_dai, substream, dma_data);
 
         /* we can only change the settings if the port is not in use */
         if (pxa_ssp_read_reg(ssp, SSCR0) & SSCR0_SSE)
@@ -668,12 +662,10 @@ static int pxa_ssp_hw_params(struct snd_pcm_substream *substream,
 }
 
 static int pxa_ssp_trigger(struct snd_pcm_substream *substream, int cmd,
-                           struct snd_soc_dai *dai)
+                           struct snd_soc_dai *cpu_dai)
 {
-        struct snd_soc_pcm_runtime *rtd = substream->private_data;
-        struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
         int ret = 0;
-        struct ssp_priv *priv = cpu_dai->private_data;
+        struct ssp_priv *priv = snd_soc_dai_get_drvdata(cpu_dai);
         struct ssp_device *ssp = priv->ssp;
         int val;
 
@@ -729,8 +721,7 @@ static int pxa_ssp_trigger(struct snd_pcm_substream *substream, int cmd,
         return ret;
 }
 
-static int pxa_ssp_probe(struct platform_device *pdev,
-                            struct snd_soc_dai *dai)
+static int pxa_ssp_probe(struct snd_soc_dai *dai)
 {
         struct ssp_priv *priv;
         int ret;
@@ -746,7 +737,7 @@ static int pxa_ssp_probe(struct platform_device *pdev,
         }
 
         priv->dai_fmt = (unsigned int) -1;
-        dai->private_data = priv;
+        snd_soc_dai_set_drvdata(dai, priv);
 
         return 0;
 
@@ -755,11 +746,12 @@ err_priv:
         return ret;
 }
 
-static void pxa_ssp_remove(struct platform_device *pdev,
-                              struct snd_soc_dai *dai)
+static int pxa_ssp_remove(struct snd_soc_dai *dai)
 {
-        struct ssp_priv *priv = dai->private_data;
+        struct ssp_priv *priv = snd_soc_dai_get_drvdata(dai);
+
         pxa_ssp_free(priv->ssp);
+        return 0;
 }
 
 #define PXA_SSP_RATES (SNDRV_PCM_RATE_8000 | SNDRV_PCM_RATE_11025 |\
@@ -784,10 +776,7 @@ static struct snd_soc_dai_ops pxa_ssp_dai_ops = {
         .set_tristate   = pxa_ssp_set_dai_tristate,
 };
 
-struct snd_soc_dai pxa_ssp_dai[] = {
-        {
-                .name = "pxa2xx-ssp1",
-                .id = 0,
+static struct snd_soc_dai_driver pxa_ssp_dai = {
                 .probe = pxa_ssp_probe,
                 .remove = pxa_ssp_remove,
                 .suspend = pxa_ssp_suspend,
@@ -805,81 +794,38 @@ struct snd_soc_dai pxa_ssp_dai[] = {
                         .formats = PXA_SSP_FORMATS,
                  },
                 .ops = &pxa_ssp_dai_ops,
+};
+
+static __devinit int asoc_ssp_probe(struct platform_device *pdev)
+{
+        return snd_soc_register_dai(&pdev->dev, &pxa_ssp_dai);
+}
+
+static int __devexit asoc_ssp_remove(struct platform_device *pdev)
+{
+        snd_soc_unregister_dai(&pdev->dev);
+        return 0;
+}
+
+static struct platform_driver asoc_ssp_driver = {
+        .driver = {
+                        .name = "pxa-ssp-dai",
+                        .owner = THIS_MODULE,
         },
-        {       .name = "pxa2xx-ssp2",
-                .id = 1,
-                .probe = pxa_ssp_probe,
-                .remove = pxa_ssp_remove,
-                .suspend = pxa_ssp_suspend,
-                .resume = pxa_ssp_resume,
-                .playback = {
-                        .channels_min = 1,
-                        .channels_max = 8,
-                        .rates = PXA_SSP_RATES,
-                        .formats = PXA_SSP_FORMATS,
-                },
-                .capture = {
-                        .channels_min = 1,
-                        .channels_max = 8,
-                        .rates = PXA_SSP_RATES,
-                        .formats = PXA_SSP_FORMATS,
-                 },
-                .ops = &pxa_ssp_dai_ops,
-        },
-        {
-                .name = "pxa2xx-ssp3",
-                .id = 2,
-                .probe = pxa_ssp_probe,
-                .remove = pxa_ssp_remove,
-                .suspend = pxa_ssp_suspend,
-                .resume = pxa_ssp_resume,
-                .playback = {
-                        .channels_min = 1,
-                        .channels_max = 8,
-                        .rates = PXA_SSP_RATES,
-                        .formats = PXA_SSP_FORMATS,
-                },
-                .capture = {
-                        .channels_min = 1,
-                        .channels_max = 8,
-                        .rates = PXA_SSP_RATES,
-                        .formats = PXA_SSP_FORMATS,
-                 },
-                .ops = &pxa_ssp_dai_ops,
-        },
-        {
-                .name = "pxa2xx-ssp4",
-                .id = 3,
-                .probe = pxa_ssp_probe,
-                .remove = pxa_ssp_remove,
-                .suspend = pxa_ssp_suspend,
-                .resume = pxa_ssp_resume,
-                .playback = {
-                        .channels_min = 1,
-                        .channels_max = 8,
-                        .rates = PXA_SSP_RATES,
-                        .formats = PXA_SSP_FORMATS,
-                },
-                .capture = {
-                        .channels_min = 1,
-                        .channels_max = 8,
-                        .rates = PXA_SSP_RATES,
-                        .formats = PXA_SSP_FORMATS,
-                 },
-                .ops = &pxa_ssp_dai_ops,
-        },
+
+        .probe = asoc_ssp_probe,
+        .remove = __devexit_p(asoc_ssp_remove),
 };
-EXPORT_SYMBOL_GPL(pxa_ssp_dai);
 
 static int __init pxa_ssp_init(void)
 {
-        return snd_soc_register_dais(pxa_ssp_dai, ARRAY_SIZE(pxa_ssp_dai));
+        return platform_driver_register(&asoc_ssp_driver);
 }
 module_init(pxa_ssp_init);
 
 static void __exit pxa_ssp_exit(void)
 {
-        snd_soc_unregister_dais(pxa_ssp_dai, ARRAY_SIZE(pxa_ssp_dai));
+        platform_driver_unregister(&asoc_ssp_driver);
 }
 module_exit(pxa_ssp_exit);