vserver 1.9.3

[linux-2.6.git] / sound / pci / au88x0 / au88x0.c

diff --git a/sound/pci/au88x0/au88x0.c b/sound/pci/au88x0/au88x0.c
index 5c6a78b..94eff49 100644 (file)
--- a/sound/pci/au88x0/au88x0.c
+++ b/sound/pci/au88x0/au88x0.c
@@ -31,23 +31,16 @@ static int boot_devs;
 
 module_param_array(index, int, boot_devs, 0444);
 MODULE_PARM_DESC(index, "Index value for " CARD_NAME " soundcard.");
-MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
 module_param_array(id, charp, boot_devs, 0444);
 MODULE_PARM_DESC(id, "ID string for " CARD_NAME " soundcard.");
-MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
 module_param_array(enable, bool, boot_devs, 0444);
 MODULE_PARM_DESC(enable, "Enable " CARD_NAME " soundcard.");
-MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
 module_param_array(pcifix, int, boot_devs, 0444);
 MODULE_PARM_DESC(pcifix, "Enable VIA-workaround for " CARD_NAME " soundcard.");
-MODULE_PARM_SYNTAX(pcifix,
-                  SNDRV_ENABLED
-                  ",allows:{{0,Disabled},{1,Latency},{2,Bridge},{3,Both},{255,Auto}},default:4,dialog:check");
 
 MODULE_DESCRIPTION("Aureal vortex");
-MODULE_CLASSES("{sound}");
 MODULE_LICENSE("GPL");
-MODULE_DEVICES("{{Aureal Semiconductor Inc., Aureal Vortex Sound Processor}}");
+MODULE_SUPPORTED_DEVICE("{{Aureal Semiconductor Inc., Aureal Vortex Sound Processor}}");
 
 MODULE_DEVICE_TABLE(pci, snd_vortex_ids);
 
@@ -122,8 +115,7 @@ static void __devinit snd_vortex_workaround(struct pci_dev *vortex, int fix)
 // (see "Management of Cards and Components")
 static int snd_vortex_dev_free(snd_device_t * device)
 {
-       vortex_t *vortex = snd_magic_cast(vortex_t, device->device_data,
-                                         return -ENXIO);
+       vortex_t *vortex = device->device_data;
 
        vortex_gameport_unregister(vortex);
        vortex_core_shutdown(vortex);
@@ -132,7 +124,7 @@ static int snd_vortex_dev_free(snd_device_t * device)
        free_irq(vortex->irq, vortex);
        pci_release_regions(vortex->pci_dev);
        pci_disable_device(vortex->pci_dev);
-       snd_magic_kfree(vortex);
+       kfree(vortex);
 
        return 0;
 }
@@ -159,7 +151,7 @@ snd_vortex_create(snd_card_t * card, struct pci_dev *pci, vortex_t ** rchip)
        }
        pci_set_dma_mask(pci, VORTEX_DMA_MASK);
 
-       chip = snd_magic_kcalloc(vortex_t, 0, GFP_KERNEL);
+       chip = kcalloc(1, sizeof(*chip), GFP_KERNEL);
        if (chip == NULL)
                return -ENOMEM;