Changeset 679 for GPL/trunk/alsa-kernel/isa/gus/gusmax.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/isa/gus/gusmax.c (modified) (19 diffs)

GPL/trunk/alsa-kernel/isa/gus/gusmax.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Driver for Gravis UltraSound MAX soundcard
  *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
- *
- *
- *   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/delay.h>
 #include <linux/time.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <asm/dma.h>
 #include <sound/core.h>
@@ -41 +26 @@
 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;  /* Enable this card */
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE; /* Enable this card */
 static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;     /* 0x220,0x230,0x240,0x250,0x260 */
 static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ;        /* 2,3,5,9,11,12,15 */
@@ -57 +42 @@
 module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable GUS MAX soundcard.");
-module_param_array(port, long, NULL, 0444);
+module_param_hw_array(port, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(port, "Port # for GUS MAX driver.");
-module_param_array(irq, int, NULL, 0444);
+module_param_hw_array(irq, int, irq, NULL, 0444);
 MODULE_PARM_DESC(irq, "IRQ # for GUS MAX driver.");
-module_param_array(dma1, int, NULL, 0444);
+module_param_hw_array(dma1, int, dma, NULL, 0444);
 MODULE_PARM_DESC(dma1, "DMA1 # for GUS MAX driver.");
-module_param_array(dma2, int, NULL, 0444);
+module_param_hw_array(dma2, int, dma, NULL, 0444);
 MODULE_PARM_DESC(dma2, "DMA2 # for GUS MAX driver.");
 module_param_array(joystick_dac, int, NULL, 0444);
@@ -83 +68 @@
 #define PFX     "gusmax: "
 
-static int __devinit snd_gusmax_detect(struct snd_gus_card * gus)
+static int snd_gusmax_detect(struct snd_gus_card *gus)
 {
         unsigned char d;
@@ -125 +110 @@
 }
 
-static void __devinit snd_gusmax_init(int dev, struct snd_card *card,
-                                      struct snd_gus_card * gus)
+static void snd_gusmax_init(int dev, struct snd_card *card,
+                            struct snd_gus_card *gus)
 {
         gus->equal_irq = 1;
@@ -141 +126 @@
 }
 
-static int __devinit snd_gusmax_mixer(struct snd_wss *chip)
+static int snd_gusmax_mixer(struct snd_wss *chip)
 {
         struct snd_card *card = chip->card;
@@ -200 +185 @@
 }
 
-static int __devinit snd_gusmax_match(struct device *pdev, unsigned int dev)
+static int snd_gusmax_match(struct device *pdev, unsigned int dev)
 {
         return enable[dev];
 }
 
-static int __devinit snd_gusmax_probe(struct device *pdev, unsigned int dev)
-{
-        static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, -1};
-        static int possible_dmas[] = {5, 6, 7, 1, 3, -1};
+static int snd_gusmax_probe(struct device *pdev, unsigned int dev)
+{
+        static const int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, -1};
+        static const int possible_dmas[] = {5, 6, 7, 1, 3, -1};
         int xirq, xdma1, xdma2, err;
         struct snd_card *card;
@@ -215 +200 @@
         struct snd_gusmax *maxcard;
 
-        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
-                              sizeof(struct snd_gusmax), &card);
+        err = snd_card_new(pdev, index[dev], id[dev], THIS_MODULE,
+                           sizeof(struct snd_gusmax), &card);
         if (err < 0)
                 return err;
@@ -257 +242 @@
                                      0, &gus);
         } else {
-                static unsigned long possible_ports[] = {
+                static const unsigned long possible_ports[] = {
                         0x220, 0x230, 0x240, 0x250, 0x260
                 };
@@ -292 +277 @@
         }
 
-        if (request_irq(xirq, snd_gusmax_interrupt, IRQF_DISABLED, "GUS MAX", (void *)maxcard)) {
+        if (request_irq(xirq, snd_gusmax_interrupt, 0, "GUS MAX", (void *)maxcard)) {
                 snd_printk(KERN_ERR PFX "unable to grab IRQ %d\n", xirq);
                 err = -EBUSY;
@@ -298 +283 @@
         }
         maxcard->irq = xirq;
-        
+        card->sync_irq = maxcard->irq;
+
         err = snd_wss_create(card,
                              gus->gf1.port + 0x10c, -1, xirq,
@@ -310 +296 @@
                 goto _err;
 
-        err = snd_wss_pcm(wss, 0, NULL);
+        err = snd_wss_pcm(wss, 0);
         if (err < 0)
                 goto _err;
@@ -318 +304 @@
                 goto _err;
 
-        err = snd_wss_timer(wss, 2, NULL);
+        err = snd_wss_timer(wss, 2);
         if (err < 0)
                 goto _err;
 
         if (pcm_channels[dev] > 0) {
-                if ((err = snd_gf1_pcm_new(gus, 1, 1, NULL)) < 0)
+                if ((err = snd_gf1_pcm_new(gus, 1, 1)) < 0)
                         goto _err;
         }
@@ -330 +316 @@
                 goto _err;
 
-        err = snd_gf1_rawmidi_new(gus, 0, NULL);
+        err = snd_gf1_rawmidi_new(gus, 0);
         if (err < 0)
                 goto _err;
@@ -338 +324 @@
                 sprintf(card->longname + strlen(card->longname), "&%i", xdma2);
 
-        snd_card_set_dev(card, pdev);
-
         err = snd_card_register(card);
         if (err < 0)
@@ -355 +339 @@
 }
 
-static int __devexit snd_gusmax_remove(struct device *devptr, unsigned int dev)
+static int snd_gusmax_remove(struct device *devptr, unsigned int dev)
 {
         snd_card_free(dev_get_drvdata(devptr));
-        dev_set_drvdata(devptr, NULL);
         return 0;
 }
@@ -367 +350 @@
         .match          = snd_gusmax_match,
         .probe          = snd_gusmax_probe,
-        .remove         = __devexit_p(snd_gusmax_remove),
+        .remove         = snd_gusmax_remove,
         /* FIXME: suspend/resume */
         .driver         = {
@@ -374 +357 @@
 };
 
-static int __init alsa_card_gusmax_init(void)
-{
-        return isa_register_driver(&snd_gusmax_driver, SNDRV_CARDS);
-}
-
-static void __exit alsa_card_gusmax_exit(void)
-{
-        isa_unregister_driver(&snd_gusmax_driver);
-}
-
-module_init(alsa_card_gusmax_init)
-module_exit(alsa_card_gusmax_exit)
+module_isa_driver(snd_gusmax_driver, SNDRV_CARDS);