1 files changed, 21 insertions, 10 deletions

diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c
index 01f7f37a841..dbee59906ae 100644
--- a/sound/pci/mixart/mixart.c
+++ b/sound/pci/mixart/mixart.c
@@ -25,7 +25,7 @@
 #include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
-#include <linux/module.h>
+#include <linux/moduleparam.h>
 #include <linux/mutex.h>
 #include <linux/slab.h>
 
@@ -49,7 +49,7 @@ MODULE_SUPPORTED_DEVICE("{{Digigram," CARD_NAME "}}");
 
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;             /* Index 0-MAX */
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;              /* ID for this card */
-static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;     /* Enable this card */
+static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;     /* Enable this card */
 
 module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for Digigram " CARD_NAME " soundcard.");
@@ -1004,7 +1004,7 @@ static int snd_mixart_chip_dev_free(struct snd_device *device)
 
 /*
  */
-static int snd_mixart_create(struct mixart_mgr *mgr, struct snd_card *card, int idx)
+static int __devinit snd_mixart_create(struct mixart_mgr *mgr, struct snd_card *card, int idx)
 {
         int err;
         struct snd_mixart *chip;
@@ -1180,7 +1180,7 @@ static void snd_mixart_proc_read(struct snd_info_entry *entry,
         } /* endif elf loaded */
 }
 
-static void snd_mixart_proc_init(struct snd_mixart *chip)
+static void __devinit snd_mixart_proc_init(struct snd_mixart *chip)
 {
         struct snd_info_entry *entry;
 
@@ -1209,8 +1209,8 @@ static void snd_mixart_proc_init(struct snd_mixart *chip)
 /*
  *    probe function - creates the card manager
  */
-static int snd_mixart_probe(struct pci_dev *pci,
-                            const struct pci_device_id *pci_id)
+static int __devinit snd_mixart_probe(struct pci_dev *pci,
+                                      const struct pci_device_id *pci_id)
 {
         static int dev;
         struct mixart_mgr *mgr;
@@ -1374,17 +1374,28 @@ static int snd_mixart_probe(struct pci_dev *pci,
         return 0;
 }
 
-static void snd_mixart_remove(struct pci_dev *pci)
+static void __devexit snd_mixart_remove(struct pci_dev *pci)
 {
         snd_mixart_free(pci_get_drvdata(pci));
         pci_set_drvdata(pci, NULL);
 }
 
-static struct pci_driver mixart_driver = {
+static struct pci_driver driver = {
         .name = KBUILD_MODNAME,
         .id_table = snd_mixart_ids,
         .probe = snd_mixart_probe,
-        .remove = snd_mixart_remove,
+        .remove = __devexit_p(snd_mixart_remove),
 };
 
-module_pci_driver(mixart_driver);
+static int __init alsa_card_mixart_init(void)
+{
+        return pci_register_driver(&driver);
+}
+
+static void __exit alsa_card_mixart_exit(void)
+{
+        pci_unregister_driver(&driver);
+}
+
+module_init(alsa_card_mixart_init)
+module_exit(alsa_card_mixart_exit)