Changeset 679 for GPL/trunk/alsa-kernel/pci/trident/trident.c

Timestamp:

Mar 18, 2021, 8:57:36 PM (4 years ago)

Author:

David Azarewicz

Message:

Merge changes from Paul's uniaud32next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/pci/trident/trident.c (modified) (12 diffs)

GPL/trunk/alsa-kernel/pci/trident/trident.c ¶

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Driver for Trident 4DWave DX/NX & SiS SI7018 Audio PCI soundcard
@@ -4 +5 @@
  *  Driver was originated by Trident <audio@tridentmicro.com>
  *                           Fri Feb 19 15:55:28 MST 1999
- *
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
- *
  */
 
@@ -25 +10 @@
 #include <linux/pci.h>
 #include <linux/time.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <sound/core.h>
-#include <sound/trident.h>
+#include "trident.h"
 #include <sound/initval.h>
+
+#ifdef TARGET_OS2
+#define KBUILD_MODNAME "trident"
+#endif
 
 MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>, <audio@tridentmicro.com>");
@@ -48 +37 @@
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 0-MAX */
 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 bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;     /* Enable this card */
 #ifndef TARGET_OS2
 static int pcm_channels[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 32};
@@ -68 +57 @@
 MODULE_PARM_DESC(wavetable_size, "Maximum memory size in kB for wavetable synth.");
 
-static DEFINE_PCI_DEVICE_TABLE(snd_trident_ids) = {
+static const struct pci_device_id snd_trident_ids[] = {
         {PCI_DEVICE(PCI_VENDOR_ID_TRIDENT, PCI_DEVICE_ID_TRIDENT_4DWAVE_DX), 
                 PCI_CLASS_MULTIMEDIA_AUDIO << 8, 0xffff00, 0},
@@ -79 +68 @@
 MODULE_DEVICE_TABLE(pci, snd_trident_ids);
 
-static int __devinit snd_trident_probe(struct pci_dev *pci,
-                                       const struct pci_device_id *pci_id)
+static int snd_trident_probe(struct pci_dev *pci,
+                             const struct pci_device_id *pci_id)
 {
         static int dev;
@@ -95 +84 @@
         }
 
-        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+        err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,
+                           0, &card);
         if (err < 0)
                 return err;
@@ -128 +118 @@
                 strcpy(card->shortname, "Trident ");
         }
-        strcat(card->shortname, card->driver);
+        strcat(card->shortname, str);
         sprintf(card->longname, "%s PCI Audio at 0x%lx, irq %d",
                 card->shortname, trident->port, trident->irq);
 
-        if ((err = snd_trident_pcm(trident, pcm_dev++, NULL)) < 0) {
+        if ((err = snd_trident_pcm(trident, pcm_dev++)) < 0) {
                 snd_card_free(card);
                 return err;
@@ -139 +129 @@
         case TRIDENT_DEVICE_ID_DX:
         case TRIDENT_DEVICE_ID_NX:
-                if ((err = snd_trident_foldback_pcm(trident, pcm_dev++, NULL)) < 0) {
+                if ((err = snd_trident_foldback_pcm(trident, pcm_dev++)) < 0) {
                         snd_card_free(card);
                         return err;
@@ -146 +136 @@
         }
         if (trident->device == TRIDENT_DEVICE_ID_NX || trident->device == TRIDENT_DEVICE_ID_SI7018) {
-                if ((err = snd_trident_spdif_pcm(trident, pcm_dev++, NULL)) < 0) {
+                if ((err = snd_trident_spdif_pcm(trident, pcm_dev++)) < 0) {
                         snd_card_free(card);
                         return err;
@@ -154 +144 @@
             (err = snd_mpu401_uart_new(card, 0, MPU401_HW_TRID4DWAVE,
                                        trident->midi_port,
-                                       MPU401_INFO_INTEGRATED,
-                                       trident->irq, 0, &trident->rmidi)) < 0) {
+                                       MPU401_INFO_INTEGRATED |
+                                       MPU401_INFO_IRQ_HOOK,
+                                       -1, &trident->rmidi)) < 0) {
                 snd_card_free(card);
                 return err;
@@ -171 +162 @@
 }
 
-static void __devexit snd_trident_remove(struct pci_dev *pci)
+static void snd_trident_remove(struct pci_dev *pci)
 {
         snd_card_free(pci_get_drvdata(pci));
-        pci_set_drvdata(pci, NULL);
 }
 
-static struct pci_driver driver = {
-        .name = "Trident4DWaveAudio",
+static struct pci_driver trident_driver = {
+        .name = KBUILD_MODNAME,
         .id_table = snd_trident_ids,
         .probe = snd_trident_probe,
-        .remove = __devexit_p(snd_trident_remove),
-#ifdef CONFIG_PM
-        .suspend = snd_trident_suspend,
-        .resume = snd_trident_resume,
+        .remove = snd_trident_remove,
+#ifdef CONFIG_PM_SLEEP
+        .driver = {
+                .pm = &snd_trident_pm,
+        },
 #endif
 };
 
-static int __init alsa_card_trident_init(void)
-{
-        return pci_register_driver(&driver);
-}
-
-static void __exit alsa_card_trident_exit(void)
-{
-        pci_unregister_driver(&driver);
-}
-
-module_init(alsa_card_trident_init)
-module_exit(alsa_card_trident_exit)
+module_pci_driver(trident_driver);