Patched in Tegra support.

2 files changed, 28 insertions, 20 deletions

diff --git a/sound/sh/aica.c b/sound/sh/aica.c
index e59a73a9bc4..94c6ea7fa7c 100644
--- a/sound/sh/aica.c
+++ b/sound/sh/aica.c
@@ -29,7 +29,7 @@
 #include <linux/slab.h>
 #include <linux/time.h>
 #include <linux/wait.h>
-#include <linux/module.h>
+#include <linux/moduleparam.h>
 #include <linux/platform_device.h>
 #include <linux/firmware.h>
 #include <linux/timer.h>
@@ -55,7 +55,7 @@ MODULE_FIRMWARE("aica_firmware.bin");
 #define CARD_NAME "AICA"
 static int index = -1;
 static char *id;
-static bool enable = 1;
+static int enable = 1;
 module_param(index, int, 0444);
 MODULE_PARM_DESC(index, "Index value for " CARD_NAME " soundcard.");
 module_param(id, charp, 0444);
@@ -540,7 +540,7 @@ static int aica_pcmvolume_put(struct snd_kcontrol *kcontrol,
         return 1;
 }
 
-static struct snd_kcontrol_new snd_aica_pcmswitch_control = {
+static struct snd_kcontrol_new snd_aica_pcmswitch_control __devinitdata = {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
         .name = "PCM Playback Switch",
         .index = 0,
@@ -549,7 +549,7 @@ static struct snd_kcontrol_new snd_aica_pcmswitch_control = {
         .put = aica_pcmswitch_put
 };
 
-static struct snd_kcontrol_new snd_aica_pcmvolume_control = {
+static struct snd_kcontrol_new snd_aica_pcmvolume_control __devinitdata = {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
         .name = "PCM Playback Volume",
         .index = 0,
@@ -574,7 +574,8 @@ static int load_aica_firmware(void)
         return err;
 }
 
-static int add_aicamixer_controls(struct snd_card_aica *dreamcastcard)
+static int __devinit add_aicamixer_controls(struct snd_card_aica
+                                            *dreamcastcard)
 {
         int err;
         err = snd_ctl_add
@@ -590,7 +591,7 @@ static int add_aicamixer_controls(struct snd_card_aica *dreamcastcard)
         return 0;
 }
 
-static int snd_aica_remove(struct platform_device *devptr)
+static int __devexit snd_aica_remove(struct platform_device *devptr)
 {
         struct snd_card_aica *dreamcastcard;
         dreamcastcard = platform_get_drvdata(devptr);
@@ -602,7 +603,7 @@ static int snd_aica_remove(struct platform_device *devptr)
         return 0;
 }
 
-static int snd_aica_probe(struct platform_device *devptr)
+static int __devinit snd_aica_probe(struct platform_device *devptr)
 {
         int err;
         struct snd_card_aica *dreamcastcard;
@@ -651,11 +652,9 @@ static int snd_aica_probe(struct platform_device *devptr)
 
 static struct platform_driver snd_aica_driver = {
         .probe = snd_aica_probe,
-        .remove = snd_aica_remove,
+        .remove = __devexit_p(snd_aica_remove),
         .driver = {
-                .name = SND_AICA_DRIVER,
-                .owner  = THIS_MODULE,
-        },
+                   .name = SND_AICA_DRIVER},
 };
 
 static int __init aica_init(void)
diff --git a/sound/sh/sh_dac_audio.c b/sound/sh/sh_dac_audio.c
index e68c4fc91a0..68e0dee4ff0 100644
--- a/sound/sh/sh_dac_audio.c
+++ b/sound/sh/sh_dac_audio.c
@@ -27,7 +27,6 @@
 #include <linux/io.h>
 #include <linux/platform_device.h>
 #include <linux/slab.h>
-#include <linux/module.h>
 #include <sound/core.h>
 #include <sound/initval.h>
 #include <sound/pcm.h>
@@ -261,7 +260,7 @@ static struct snd_pcm_ops snd_sh_dac_pcm_ops = {
         .mmap           = snd_pcm_lib_mmap_iomem,
 };
 
-static int snd_sh_dac_pcm(struct snd_sh_dac *chip, int device)
+static int __devinit snd_sh_dac_pcm(struct snd_sh_dac *chip, int device)
 {
         int err;
         struct snd_pcm *pcm;
@@ -346,9 +345,9 @@ static enum hrtimer_restart sh_dac_audio_timer(struct hrtimer *handle)
 }
 
 /* create  --  chip-specific constructor for the cards components */
-static int snd_sh_dac_create(struct snd_card *card,
-                             struct platform_device *devptr,
-                             struct snd_sh_dac **rchip)
+static int __devinit snd_sh_dac_create(struct snd_card *card,
+                                       struct platform_device *devptr,
+                                       struct snd_sh_dac **rchip)
 {
         struct snd_sh_dac *chip;
         int err;
@@ -392,7 +391,7 @@ static int snd_sh_dac_create(struct snd_card *card,
 }
 
 /* driver .probe  --  constructor */
-static int snd_sh_dac_probe(struct platform_device *devptr)
+static int __devinit snd_sh_dac_probe(struct platform_device *devptr)
 {
         struct snd_sh_dac *chip;
         struct snd_card *card;
@@ -433,13 +432,23 @@ probe_error:
 /*
  * "driver" definition
  */
-static struct platform_driver sh_dac_driver = {
+static struct platform_driver driver = {
         .probe  = snd_sh_dac_probe,
         .remove = snd_sh_dac_remove,
         .driver = {
                 .name = "dac_audio",
-                .owner  = THIS_MODULE,
         },
 };
 
-module_platform_driver(sh_dac_driver);
+static int __init sh_dac_init(void)
+{
+        return platform_driver_register(&driver);
+}
+
+static void __exit sh_dac_exit(void)
+{
+        platform_driver_unregister(&driver);
+}
+
+module_init(sh_dac_init);
+module_exit(sh_dac_exit);