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

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

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Driver for AMD InterWave 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
- *
  *   1999/07/22         Erik Inge Bolso <knan@mo.himolde.no>
  *                      * mixer group handlers
- *
  */
 
@@ -28 +13 @@
 #include <linux/delay.h>
 #include <linux/pnp.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <asm/dma.h>
 #include <sound/core.h>
@@ -56 +41 @@
 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_ISAPNP; /* Enable this card */
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP; /* Enable this card */
 #ifdef CONFIG_PNP
-static int isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
+static bool isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
 #endif
 static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;     /* 0x210,0x220,0x230,0x240,0x250,0x260 */
@@ -93 +78 @@
 MODULE_PARM_DESC(isapnp, "ISA PnP detection for specified soundcard.");
 #endif
-module_param_array(port, long, NULL, 0444);
+module_param_hw_array(port, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(port, "Port # for InterWave driver.");
 #ifdef SNDRV_STB
-module_param_array(port_tc, long, NULL, 0444);
+module_param_hw_array(port_tc, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(port_tc, "Tone control (TEA6330T - i2c bus) port # for InterWave driver.");
 #endif
-module_param_array(irq, int, NULL, 0444);
+module_param_hw_array(irq, int, irq, NULL, 0444);
 MODULE_PARM_DESC(irq, "IRQ # for InterWave driver.");
-module_param_array(dma1, int, NULL, 0444);
+module_param_hw_array(dma1, int, dma, NULL, 0444);
 MODULE_PARM_DESC(dma1, "DMA1 # for InterWave driver.");
-module_param_array(dma2, int, NULL, 0444);
+module_param_hw_array(dma2, int, dma, NULL, 0444);
 MODULE_PARM_DESC(dma2, "DMA2 # for InterWave driver.");
 module_param_array(joystick_dac, int, NULL, 0444);
@@ -137 +122 @@
 static int pnp_registered;
 
-static struct pnp_card_device_id snd_interwave_pnpids[] = {
+static const struct pnp_card_device_id snd_interwave_pnpids[] = {
 #ifndef SNDRV_STB
         /* Gravis UltraSound Plug & Play */
@@ -208 +193 @@
 };
 
-static int __devinit snd_interwave_detect_stb(struct snd_interwave *iwcard,
-                                              struct snd_gus_card * gus, int dev,
-                                              struct snd_i2c_bus **rbus)
+static int snd_interwave_detect_stb(struct snd_interwave *iwcard,
+                                    struct snd_gus_card *gus, int dev,
+                                    struct snd_i2c_bus **rbus)
 {
         unsigned long port;
@@ -250 +235 @@
 #endif
 
-static int __devinit snd_interwave_detect(struct snd_interwave *iwcard,
-                                          struct snd_gus_card * gus,
-                                          int dev
-#ifdef SNDRV_STB
-                                          , struct snd_i2c_bus **rbus
+static int snd_interwave_detect(struct snd_interwave *iwcard,
+                                struct snd_gus_card *gus,
+                                int dev
+#ifdef SNDRV_STB
+                                , struct snd_i2c_bus **rbus
 #endif
                                           )
@@ -319 +304 @@
 }
 
-static void __devinit snd_interwave_reset(struct snd_gus_card * gus)
+static void snd_interwave_reset(struct snd_gus_card *gus)
 {
         snd_gf1_write8(gus, SNDRV_GF1_GB_RESET, 0x00);
@@ -327 +312 @@
 }
 
-static void __devinit snd_interwave_bank_sizes(struct snd_gus_card * gus, int *sizes)
+static void snd_interwave_bank_sizes(struct snd_gus_card *gus, int *sizes)
 {
         unsigned int idx;
@@ -378 +363 @@
 };
 
-static void __devinit snd_interwave_detect_memory(struct snd_gus_card * gus)
-{
-        static unsigned int lmc[13] =
+static void snd_interwave_detect_memory(struct snd_gus_card *gus)
+{
+        static const unsigned int lmc[13] =
         {
                 0x00000001, 0x00000101, 0x01010101, 0x00000401,
@@ -443 +428 @@
                 for (i = 0; i < 8; ++i)
                         iwave[i] = snd_gf1_peek(gus, bank_pos + i);
-#ifdef CONFIG_SND_DEBUG_ROM
-                printk(KERN_DEBUG "ROM at 0x%06x = %02x:%02x:%02x:%02x:%02x:%02x:%02x:%02x\n", bank_pos,
-                       iwave[0], iwave[1], iwave[2], iwave[3],
-                       iwave[4], iwave[5], iwave[6], iwave[7]);
-#endif
                 if (strncmp(iwave, "INTRWAVE", 8))
                         continue;       /* first check */
@@ -453 +433 @@
                 for (i = 0; i < sizeof(struct rom_hdr); i++)
                         csum += snd_gf1_peek(gus, bank_pos + i);
-#ifdef CONFIG_SND_DEBUG_ROM
-                printk(KERN_DEBUG "ROM checksum = 0x%x (computed)\n", csum);
-#endif
                 if (csum != 0)
                         continue;       /* not valid rom */
@@ -477 +454 @@
 }
 
-static void __devinit snd_interwave_init(int dev, struct snd_gus_card * gus)
+static void snd_interwave_init(int dev, struct snd_gus_card *gus)
 {
         unsigned long flags;
@@ -499 +476 @@
 }
 
-static struct snd_kcontrol_new snd_interwave_controls[] = {
+static const struct snd_kcontrol_new snd_interwave_controls[] = {
 WSS_DOUBLE("Master Playback Switch", 0,
                 CS4231_LINE_LEFT_OUTPUT, CS4231_LINE_RIGHT_OUTPUT, 7, 7, 1, 1),
@@ -510 +487 @@
 };
 
-static int __devinit snd_interwave_mixer(struct snd_wss *chip)
+static int snd_interwave_mixer(struct snd_wss *chip)
 {
         struct snd_card *card = chip->card;
@@ -560 +537 @@
 #ifdef CONFIG_PNP
 
-static int __devinit snd_interwave_pnp(int dev, struct snd_interwave *iwcard,
-                                       struct pnp_card_link *card,
-                                       const struct pnp_card_device_id *id)
+static int snd_interwave_pnp(int dev, struct snd_interwave *iwcard,
+                             struct pnp_card_link *card,
+                             const struct pnp_card_device_id *id)
 {
         struct pnp_dev *pdev;
@@ -628 +605 @@
 }
 
-static int snd_interwave_card_new(int dev, struct snd_card **cardp)
+static int snd_interwave_card_new(struct device *pdev, int dev,
+                                  struct snd_card **cardp)
 {
         struct snd_card *card;
@@ -634 +612 @@
         int err;
 
-        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
-                              sizeof(struct snd_interwave), &card);
+        err = snd_card_new(pdev, index[dev], id[dev], THIS_MODULE,
+                           sizeof(struct snd_interwave), &card);
         if (err < 0)
                 return err;
@@ -646 +624 @@
 }
 
-static int __devinit snd_interwave_probe(struct snd_card *card, int dev)
+static int snd_interwave_probe(struct snd_card *card, int dev)
 {
         int xirq, xdma1, xdma2;
@@ -655 +633 @@
         struct snd_i2c_bus *i2c_bus;
 #endif
-        struct snd_pcm *pcm;
         char *str;
         int err;
@@ -685 +662 @@
                 return err;
 
-        if (request_irq(xirq, snd_interwave_interrupt, IRQF_DISABLED,
+        if (request_irq(xirq, snd_interwave_interrupt, 0,
                         "InterWave", iwcard)) {
                 snd_printk(KERN_ERR PFX "unable to grab IRQ %d\n", xirq);
@@ -691 +668 @@
         }
         iwcard->irq = xirq;
+        card->sync_irq = iwcard->irq;
 
         err = snd_wss_create(card,
@@ -703 +681 @@
                 return err;
 
-        err = snd_wss_pcm(wss, 0, &pcm);
+        err = snd_wss_pcm(wss, 0);
         if (err < 0)
                 return err;
 
-        sprintf(pcm->name + strlen(pcm->name), " rev %c", gus->revision + 'A');
-        strcat(pcm->name, " (codec)");
-
-        err = snd_wss_timer(wss, 2, NULL);
+        sprintf(wss->pcm->name + strlen(wss->pcm->name), " rev %c",
+                gus->revision + 'A');
+        strcat(wss->pcm->name, " (codec)");
+
+        err = snd_wss_timer(wss, 2);
         if (err < 0)
                 return err;
@@ -719 +698 @@
 
         if (pcm_channels[dev] > 0) {
-                err = snd_gf1_pcm_new(gus, 1, 1, NULL);
+                err = snd_gf1_pcm_new(gus, 1, 1);
                 if (err < 0)
                         return err;
@@ -748 +727 @@
 
         gus->uart_enable = midi[dev];
-        if ((err = snd_gf1_rawmidi_new(gus, 0, NULL)) < 0)
+        if ((err = snd_gf1_rawmidi_new(gus, 0)) < 0)
                 return err;
 
@@ -777 +756 @@
 }
 
-static int __devinit snd_interwave_isa_probe1(int dev, struct device *devptr)
+static int snd_interwave_isa_probe1(int dev, struct device *devptr)
 {
         struct snd_card *card;
         int err;
 
-        err = snd_interwave_card_new(dev, &card);
+        err = snd_interwave_card_new(devptr, dev, &card);
         if (err < 0)
                 return err;
 
-        snd_card_set_dev(card, devptr);
         if ((err = snd_interwave_probe(card, dev)) < 0) {
                 snd_card_free(card);
@@ -795 +773 @@
 }
 
-static int __devinit snd_interwave_isa_match(struct device *pdev,
-                                             unsigned int dev)
+static int snd_interwave_isa_match(struct device *pdev,
+                                   unsigned int dev)
 {
         if (!enable[dev])
@@ -807 +785 @@
 }
 
-static int __devinit snd_interwave_isa_probe(struct device *pdev,
-                                             unsigned int dev)
+static int snd_interwave_isa_probe(struct device *pdev,
+                                   unsigned int dev)
 {
         int err;
-        static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, -1};
-        static int possible_dmas[] = {0, 1, 3, 5, 6, 7, -1};
+        static const int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, -1};
+        static const int possible_dmas[] = {0, 1, 3, 5, 6, 7, -1};
 
         if (irq[dev] == SNDRV_AUTO_IRQ) {
@@ -836 +814 @@
                 return snd_interwave_isa_probe1(dev, pdev);
         else {
-                static long possible_ports[] = {0x210, 0x220, 0x230, 0x240, 0x250, 0x260};
+                static const long possible_ports[] = {0x210, 0x220, 0x230, 0x240, 0x250, 0x260};
                 int i;
                 for (i = 0; i < ARRAY_SIZE(possible_ports); i++) {
@@ -848 +826 @@
 }
 
-static int __devexit snd_interwave_isa_remove(struct device *devptr, unsigned int dev)
+static int snd_interwave_isa_remove(struct device *devptr, unsigned int dev)
 {
         snd_card_free(dev_get_drvdata(devptr));
-        dev_set_drvdata(devptr, NULL);
         return 0;
 }
@@ -858 +835 @@
         .match          = snd_interwave_isa_match,
         .probe          = snd_interwave_isa_probe,
-        .remove         = __devexit_p(snd_interwave_isa_remove),
+        .remove         = snd_interwave_isa_remove,
         /* FIXME: suspend,resume */
         .driver         = {
@@ -866 +843 @@
 
 #ifdef CONFIG_PNP
-static int __devinit snd_interwave_pnp_detect(struct pnp_card_link *pcard,
-                                              const struct pnp_card_device_id *pid)
+static int snd_interwave_pnp_detect(struct pnp_card_link *pcard,
+                                    const struct pnp_card_device_id *pid)
 {
         static int dev;
@@ -880 +857 @@
                 return -ENODEV;
                                 
-        res = snd_interwave_card_new(dev, &card);
+        res = snd_interwave_card_new(&pcard->card->dev, dev, &card);
         if (res < 0)
                 return res;
@@ -888 +865 @@
                 return res;
         }
-        snd_card_set_dev(card, &pcard->card->dev);
         if ((res = snd_interwave_probe(card, dev)) < 0) {
                 snd_card_free(card);
@@ -898 +874 @@
 }
 
-static void __devexit snd_interwave_pnp_remove(struct pnp_card_link * pcard)
+static void snd_interwave_pnp_remove(struct pnp_card_link *pcard)
 {
         snd_card_free(pnp_get_card_drvdata(pcard));
@@ -909 +885 @@
         .id_table = snd_interwave_pnpids,
         .probe = snd_interwave_pnp_detect,
-        .remove = __devexit_p(snd_interwave_pnp_remove),
+        .remove = snd_interwave_pnp_remove,
         /* FIXME: suspend,resume */
 };