Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/sound/pci/trident/trident.c b/sound/pci/trident/trident.c
index eb3a882..9624a5f 100644 (file)
--- a/sound/pci/trident/trident.c
+++ b/sound/pci/trident/trident.c
@@ -33,8 +33,7 @@
 MODULE_AUTHOR("Jaroslav Kysela <perex@suse.cz>, <audio@tridentmicro.com>");
 MODULE_DESCRIPTION("Trident 4D-WaveDX/NX & SiS SI7018");
 MODULE_LICENSE("GPL");
-MODULE_CLASSES("{sound}");
-MODULE_DEVICES("{{Trident,4DWave DX},"
+MODULE_SUPPORTED_DEVICE("{{Trident,4DWave DX},"
                "{Trident,4DWave NX},"
                "{SiS,SI7018 PCI Audio},"
                "{Best Union,Miss Melody 4DWave PCI},"
@@ -52,28 +51,24 @@ static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;   /* ID for this card */
 static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;     /* Enable this card */
 static int pcm_channels[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 32};
 static int wavetable_size[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 8192};
-static int boot_devs;
 
-module_param_array(index, int, boot_devs, 0444);
+module_param_array(index, int, NULL, 0444);
 MODULE_PARM_DESC(index, "Index value for Trident 4DWave PCI soundcard.");
-MODULE_PARM_SYNTAX(index, SNDRV_INDEX_DESC);
-module_param_array(id, charp, boot_devs, 0444);
+module_param_array(id, charp, NULL, 0444);
 MODULE_PARM_DESC(id, "ID string for Trident 4DWave PCI soundcard.");
-MODULE_PARM_SYNTAX(id, SNDRV_ID_DESC);
-module_param_array(enable, bool, boot_devs, 0444);
+module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable Trident 4DWave PCI soundcard.");
-MODULE_PARM_SYNTAX(enable, SNDRV_ENABLE_DESC);
-module_param_array(pcm_channels, int, boot_devs, 0444);
+module_param_array(pcm_channels, int, NULL, 0444);
 MODULE_PARM_DESC(pcm_channels, "Number of hardware channels assigned for PCM.");
-MODULE_PARM_SYNTAX(pcm_channels, SNDRV_ENABLED ",default:32,allows:{{1,32}}");
-module_param_array(wavetable_size, int, boot_devs, 0444);
+module_param_array(wavetable_size, int, NULL, 0444);
 MODULE_PARM_DESC(wavetable_size, "Maximum memory size in kB for wavetable synth.");
-MODULE_PARM_SYNTAX(wavetable_size, SNDRV_ENABLED ",default:8192,skill:advanced");
 
-static struct pci_device_id snd_trident_ids[] = {
-       { 0x1023, 0x2000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },   /* Trident 4DWave DX PCI Audio */
-       { 0x1023, 0x2001, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },   /* Trident 4DWave NX PCI Audio */
-       { 0x1039, 0x7018, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },   /* SiS SI7018 PCI Audio */
+static struct pci_device_id snd_trident_ids[] __devinitdata = {
+       {PCI_DEVICE(PCI_VENDOR_ID_TRIDENT, PCI_DEVICE_ID_TRIDENT_4DWAVE_DX), 
+               PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, 0},
+       {PCI_DEVICE(PCI_VENDOR_ID_TRIDENT, PCI_DEVICE_ID_TRIDENT_4DWAVE_NX), 
+               0, 0, 0},
+       {PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_7018), 0, 0, 0},
        { 0, }
 };
 
@@ -83,8 +78,8 @@ static int __devinit snd_trident_probe(struct pci_dev *pci,
                                       const struct pci_device_id *pci_id)
 {
        static int dev;
-       snd_card_t *card;
-       trident_t *trident;
+       struct snd_card *card;
+       struct snd_trident *trident;
        const char *str;
        int err, pcm_dev = 0;
 
@@ -107,6 +102,7 @@ static int __devinit snd_trident_probe(struct pci_dev *pci,
                snd_card_free(card);
                return err;
        }
+       card->private_data = trident;
 
        switch (trident->device) {
        case TRIDENT_DEVICE_ID_DX:
@@ -150,7 +146,8 @@ static int __devinit snd_trident_probe(struct pci_dev *pci,
                        return err;
                }
        }
-       if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_TRID4DWAVE,
+       if (trident->device != TRIDENT_DEVICE_ID_SI7018 &&
+           (err = snd_mpu401_uart_new(card, 0, MPU401_HW_TRID4DWAVE,
                                       trident->midi_port, 1,
                                       trident->irq, 0, &trident->rmidi)) < 0) {
                snd_card_free(card);
@@ -164,7 +161,7 @@ static int __devinit snd_trident_probe(struct pci_dev *pci,
        }
 #endif
 
-       snd_trident_gameport(trident);
+       snd_trident_create_gameport(trident);
 
        if ((err = snd_card_register(card)) < 0) {
                snd_card_free(card);
@@ -186,12 +183,15 @@ static struct pci_driver driver = {
        .id_table = snd_trident_ids,
        .probe = snd_trident_probe,
        .remove = __devexit_p(snd_trident_remove),
-       SND_PCI_PM_CALLBACKS
+#ifdef CONFIG_PM
+       .suspend = snd_trident_suspend,
+       .resume = snd_trident_resume,
+#endif
 };
 
 static int __init alsa_card_trident_init(void)
 {
-       return pci_module_init(&driver);
+       return pci_register_driver(&driver);
 }
 
 static void __exit alsa_card_trident_exit(void)