1 files changed, 49 insertions, 10 deletions

diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c
index 812c2b4d3e07..01c21c6cdbbc 100644
--- a/sound/soc/pxa/pxa2xx-ac97.c
+++ b/sound/soc/pxa/pxa2xx-ac97.c
@@ -106,13 +106,13 @@ static int pxa2xx_ac97_resume(struct snd_soc_dai *dai)
 static int pxa2xx_ac97_probe(struct platform_device *pdev,
                              struct snd_soc_dai *dai)
 {
-        return pxa2xx_ac97_hw_probe(pdev);
+        return pxa2xx_ac97_hw_probe(to_platform_device(dai->dev));
 }
 
 static void pxa2xx_ac97_remove(struct platform_device *pdev,
                                struct snd_soc_dai *dai)
 {
-        pxa2xx_ac97_hw_remove(pdev);
+        pxa2xx_ac97_hw_remove(to_platform_device(dai->dev));
 }
 
 static int pxa2xx_ac97_hw_params(struct snd_pcm_substream *substream,
@@ -164,6 +164,18 @@ static int pxa2xx_ac97_hw_mic_params(struct snd_pcm_substream *substream,
                 SNDRV_PCM_RATE_16000 | SNDRV_PCM_RATE_22050 | SNDRV_PCM_RATE_44100 | \
                 SNDRV_PCM_RATE_48000)
 
+static struct snd_soc_dai_ops pxa_ac97_hifi_dai_ops = {
+        .hw_params      = pxa2xx_ac97_hw_params,
+};
+
+static struct snd_soc_dai_ops pxa_ac97_aux_dai_ops = {
+        .hw_params      = pxa2xx_ac97_hw_aux_params,
+};
+
+static struct snd_soc_dai_ops pxa_ac97_mic_dai_ops = {
+        .hw_params      = pxa2xx_ac97_hw_mic_params,
+};
+
 /*
  * There is only 1 physical AC97 interface for pxa2xx, but it
  * has extra fifo's that can be used for aux DACs and ADCs.
@@ -189,8 +201,7 @@ struct snd_soc_dai pxa_ac97_dai[] = {
                 .channels_max = 2,
                 .rates = PXA2XX_AC97_RATES,
                 .formats = SNDRV_PCM_FMTBIT_S16_LE,},
-        .ops = {
-                .hw_params = pxa2xx_ac97_hw_params,},
+        .ops = &pxa_ac97_hifi_dai_ops,
 },
 {
         .name = "pxa2xx-ac97-aux",
@@ -208,8 +219,7 @@ struct snd_soc_dai pxa_ac97_dai[] = {
                 .channels_max = 1,
                 .rates = PXA2XX_AC97_RATES,
                 .formats = SNDRV_PCM_FMTBIT_S16_LE,},
-        .ops = {
-                .hw_params = pxa2xx_ac97_hw_aux_params,},
+        .ops = &pxa_ac97_aux_dai_ops,
 },
 {
         .name = "pxa2xx-ac97-mic",
@@ -221,23 +231,52 @@ struct snd_soc_dai pxa_ac97_dai[] = {
                 .channels_max = 1,
                 .rates = PXA2XX_AC97_RATES,
                 .formats = SNDRV_PCM_FMTBIT_S16_LE,},
-        .ops = {
-                .hw_params = pxa2xx_ac97_hw_mic_params,},
+        .ops = &pxa_ac97_mic_dai_ops,
 },
 };
 
 EXPORT_SYMBOL_GPL(pxa_ac97_dai);
 EXPORT_SYMBOL_GPL(soc_ac97_ops);
 
-static int __init pxa_ac97_init(void)
+static int __devinit pxa2xx_ac97_dev_probe(struct platform_device *pdev)
 {
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(pxa_ac97_dai); i++)
+                pxa_ac97_dai[i].dev = &pdev->dev;
+
+        /* Punt most of the init to the SoC probe; we may need the machine
+         * driver to do interesting things with the clocking to get us up
+         * and running.
+         */
         return snd_soc_register_dais(pxa_ac97_dai, ARRAY_SIZE(pxa_ac97_dai));
 }
+
+static int __devexit pxa2xx_ac97_dev_remove(struct platform_device *pdev)
+{
+        snd_soc_unregister_dais(pxa_ac97_dai, ARRAY_SIZE(pxa_ac97_dai));
+
+        return 0;
+}
+
+static struct platform_driver pxa2xx_ac97_driver = {
+        .probe          = pxa2xx_ac97_dev_probe,
+        .remove         = __devexit_p(pxa2xx_ac97_dev_remove),
+        .driver         = {
+                .name   = "pxa2xx-ac97",
+                .owner  = THIS_MODULE,
+        },
+};
+
+static int __init pxa_ac97_init(void)
+{
+        return platform_driver_register(&pxa2xx_ac97_driver);
+}
 module_init(pxa_ac97_init);
 
 static void __exit pxa_ac97_exit(void)
 {
-        snd_soc_unregister_dais(pxa_ac97_dai, ARRAY_SIZE(pxa_ac97_dai));
+        platform_driver_unregister(&pxa2xx_ac97_driver);
 }
 module_exit(pxa_ac97_exit);