Patched in Tegra support.

1 files changed, 23 insertions, 10 deletions

diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c
index ec54be4efff..5d9411839cd 100644
--- a/sound/arm/pxa2xx-ac97.c
+++ b/sound/arm/pxa2xx-ac97.c
@@ -11,7 +11,6 @@
  */
 
 #include <linux/init.h>
-#include <linux/io.h>
 #include <linux/module.h>
 #include <linux/platform_device.h>
 
@@ -106,9 +105,9 @@ static struct pxa2xx_pcm_client pxa2xx_ac97_pcm_client = {
         .prepare                = pxa2xx_ac97_pcm_prepare,
 };
 
-#ifdef CONFIG_PM_SLEEP
+#ifdef CONFIG_PM
 
-static int pxa2xx_ac97_do_suspend(struct snd_card *card)
+static int pxa2xx_ac97_do_suspend(struct snd_card *card, pm_message_t state)
 {
         pxa2xx_audio_ops_t *platform_ops = card->dev->platform_data;
 
@@ -144,7 +143,7 @@ static int pxa2xx_ac97_suspend(struct device *dev)
         int ret = 0;
 
         if (card)
-                ret = pxa2xx_ac97_do_suspend(card);
+                ret = pxa2xx_ac97_do_suspend(card, PMSG_SUSPEND);
 
         return ret;
 }
@@ -160,10 +159,13 @@ static int pxa2xx_ac97_resume(struct device *dev)
         return ret;
 }
 
-static SIMPLE_DEV_PM_OPS(pxa2xx_ac97_pm_ops, pxa2xx_ac97_suspend, pxa2xx_ac97_resume);
+static const struct dev_pm_ops pxa2xx_ac97_pm_ops = {
+        .suspend        = pxa2xx_ac97_suspend,
+        .resume         = pxa2xx_ac97_resume,
+};
 #endif
 
-static int pxa2xx_ac97_probe(struct platform_device *dev)
+static int __devinit pxa2xx_ac97_probe(struct platform_device *dev)
 {
         struct snd_card *card;
         struct snd_ac97_bus *ac97_bus;
@@ -224,7 +226,7 @@ err_dev:
         return ret;
 }
 
-static int pxa2xx_ac97_remove(struct platform_device *dev)
+static int __devexit pxa2xx_ac97_remove(struct platform_device *dev)
 {
         struct snd_card *card = platform_get_drvdata(dev);
 
@@ -239,17 +241,28 @@ static int pxa2xx_ac97_remove(struct platform_device *dev)
 
 static struct platform_driver pxa2xx_ac97_driver = {
         .probe          = pxa2xx_ac97_probe,
-        .remove         = pxa2xx_ac97_remove,
+        .remove         = __devexit_p(pxa2xx_ac97_remove),
         .driver         = {
                 .name   = "pxa2xx-ac97",
                 .owner  = THIS_MODULE,
-#ifdef CONFIG_PM_SLEEP
+#ifdef CONFIG_PM
                 .pm     = &pxa2xx_ac97_pm_ops,
 #endif
         },
 };
 
-module_platform_driver(pxa2xx_ac97_driver);
+static int __init pxa2xx_ac97_init(void)
+{
+        return platform_driver_register(&pxa2xx_ac97_driver);
+}
+
+static void __exit pxa2xx_ac97_exit(void)
+{
+        platform_driver_unregister(&pxa2xx_ac97_driver);
+}
+
+module_init(pxa2xx_ac97_init);
+module_exit(pxa2xx_ac97_exit);
 
 MODULE_AUTHOR("Nicolas Pitre");
 MODULE_DESCRIPTION("AC97 driver for the Intel PXA2xx chip");