Patched in Tegra support.

1 files changed, 26 insertions, 16 deletions

diff --git a/sound/mips/sgio2audio.c b/sound/mips/sgio2audio.c
index 01a03efdc8b..717604c00f0 100644
--- a/sound/mips/sgio2audio.c
+++ b/sound/mips/sgio2audio.c
@@ -30,7 +30,6 @@
 #include <linux/platform_device.h>
 #include <linux/io.h>
 #include <linux/slab.h>
-#include <linux/module.h>
 
 #include <asm/ip32/ip32_ints.h>
 #include <asm/ip32/mace.h>
@@ -237,7 +236,7 @@ static int sgio2audio_source_put(struct snd_kcontrol *kcontrol,
 }
 
 /* dac1/pcm0 mixer control */
-static struct snd_kcontrol_new sgio2audio_ctrl_pcm0 = {
+static struct snd_kcontrol_new sgio2audio_ctrl_pcm0 __devinitdata = {
         .iface          = SNDRV_CTL_ELEM_IFACE_MIXER,
         .name           = "PCM Playback Volume",
         .index          = 0,
@@ -249,7 +248,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_pcm0 = {
 };
 
 /* dac2/pcm1 mixer control */
-static struct snd_kcontrol_new sgio2audio_ctrl_pcm1 = {
+static struct snd_kcontrol_new sgio2audio_ctrl_pcm1 __devinitdata = {
         .iface          = SNDRV_CTL_ELEM_IFACE_MIXER,
         .name           = "PCM Playback Volume",
         .index          = 1,
@@ -261,7 +260,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_pcm1 = {
 };
 
 /* record level mixer control */
-static struct snd_kcontrol_new sgio2audio_ctrl_reclevel = {
+static struct snd_kcontrol_new sgio2audio_ctrl_reclevel __devinitdata = {
         .iface          = SNDRV_CTL_ELEM_IFACE_MIXER,
         .name           = "Capture Volume",
         .access         = SNDRV_CTL_ELEM_ACCESS_READWRITE,
@@ -272,7 +271,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_reclevel = {
 };
 
 /* record level source control */
-static struct snd_kcontrol_new sgio2audio_ctrl_recsource = {
+static struct snd_kcontrol_new sgio2audio_ctrl_recsource __devinitdata = {
         .iface          = SNDRV_CTL_ELEM_IFACE_MIXER,
         .name           = "Capture Source",
         .access         = SNDRV_CTL_ELEM_ACCESS_READWRITE,
@@ -282,7 +281,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_recsource = {
 };
 
 /* line mixer control */
-static struct snd_kcontrol_new sgio2audio_ctrl_line = {
+static struct snd_kcontrol_new sgio2audio_ctrl_line __devinitdata = {
         .iface          = SNDRV_CTL_ELEM_IFACE_MIXER,
         .name           = "Line Playback Volume",
         .index          = 0,
@@ -294,7 +293,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_line = {
 };
 
 /* cd mixer control */
-static struct snd_kcontrol_new sgio2audio_ctrl_cd = {
+static struct snd_kcontrol_new sgio2audio_ctrl_cd __devinitdata = {
         .iface          = SNDRV_CTL_ELEM_IFACE_MIXER,
         .name           = "Line Playback Volume",
         .index          = 1,
@@ -306,7 +305,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_cd = {
 };
 
 /* mic mixer control */
-static struct snd_kcontrol_new sgio2audio_ctrl_mic = {
+static struct snd_kcontrol_new sgio2audio_ctrl_mic __devinitdata = {
         .iface          = SNDRV_CTL_ELEM_IFACE_MIXER,
         .name           = "Mic Playback Volume",
         .access         = SNDRV_CTL_ELEM_ACCESS_READWRITE,
@@ -317,7 +316,7 @@ static struct snd_kcontrol_new sgio2audio_ctrl_mic = {
 };
 
 
-static int snd_sgio2audio_new_mixer(struct snd_sgio2audio *chip)
+static int __devinit snd_sgio2audio_new_mixer(struct snd_sgio2audio *chip)
 {
         int err;
 
@@ -726,7 +725,7 @@ static struct snd_pcm_ops snd_sgio2audio_capture_ops = {
  */
 
 /* create a pcm device */
-static int snd_sgio2audio_new_pcm(struct snd_sgio2audio *chip)
+static int __devinit snd_sgio2audio_new_pcm(struct snd_sgio2audio *chip)
 {
         struct snd_pcm *pcm;
         int err;
@@ -834,8 +833,8 @@ static struct snd_device_ops ops = {
         .dev_free = snd_sgio2audio_dev_free,
 };
 
-static int snd_sgio2audio_create(struct snd_card *card,
-                                 struct snd_sgio2audio **rchip)
+static int __devinit snd_sgio2audio_create(struct snd_card *card,
+                                           struct snd_sgio2audio **rchip)
 {
         struct snd_sgio2audio *chip;
         int i, err;
@@ -914,7 +913,7 @@ static int snd_sgio2audio_create(struct snd_card *card,
         return 0;
 }
 
-static int snd_sgio2audio_probe(struct platform_device *pdev)
+static int __devinit snd_sgio2audio_probe(struct platform_device *pdev)
 {
         struct snd_card *card;
         struct snd_sgio2audio *chip;
@@ -958,7 +957,7 @@ static int snd_sgio2audio_probe(struct platform_device *pdev)
         return 0;
 }
 
-static int snd_sgio2audio_remove(struct platform_device *pdev)
+static int __devexit snd_sgio2audio_remove(struct platform_device *pdev)
 {
         struct snd_card *card = platform_get_drvdata(pdev);
 
@@ -969,11 +968,22 @@ static int snd_sgio2audio_remove(struct platform_device *pdev)
 
 static struct platform_driver sgio2audio_driver = {
         .probe  = snd_sgio2audio_probe,
-        .remove = snd_sgio2audio_remove,
+        .remove = __devexit_p(snd_sgio2audio_remove),
         .driver = {
                 .name   = "sgio2audio",
                 .owner  = THIS_MODULE,
         }
 };
 
-module_platform_driver(sgio2audio_driver);
+static int __init alsa_card_sgio2audio_init(void)
+{
+        return platform_driver_register(&sgio2audio_driver);
+}
+
+static void __exit alsa_card_sgio2audio_exit(void)
+{
+        platform_driver_unregister(&sgio2audio_driver);
+}
+
+module_init(alsa_card_sgio2audio_init)
+module_exit(alsa_card_sgio2audio_exit)