Changeset 679 for GPL/trunk/alsa-kernel/isa

Timestamp:

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

Author:

David Azarewicz

Message:

Merge changes from Paul's uniaud32next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/isa/Makefile (modified) (1 diff)
• alsa-kernel/isa/ad1816a/Makefile (copied) (copied from GPL/branches/uniaud32-next/alsa-kernel/isa/ad1816a/Makefile )
• alsa-kernel/isa/ad1816a/ad1816a.c (modified) (16 diffs)
• alsa-kernel/isa/ad1816a/ad1816a_lib.c (modified) (22 diffs)
• alsa-kernel/isa/ad1848/ad1848.c (modified) (11 diffs)
• alsa-kernel/isa/adlib.c (copied) (copied from GPL/branches/uniaud32-next/alsa-kernel/isa/adlib.c )
• alsa-kernel/isa/als100.c (modified) (15 diffs)
• alsa-kernel/isa/azt2320.c (modified) (17 diffs)
• alsa-kernel/isa/cmi8328.c (copied) (copied from GPL/branches/uniaud32-next/alsa-kernel/isa/cmi8328.c )
• alsa-kernel/isa/cmi8330.c (modified) (28 diffs)
• alsa-kernel/isa/cs423x/cs4231.c (modified) (12 diffs)
• alsa-kernel/isa/cs423x/cs4236.c (modified) (31 diffs)
• alsa-kernel/isa/cs423x/cs4236_lib.c (modified) (14 diffs)
• alsa-kernel/isa/es1688/es1688.c (modified) (20 diffs)
• alsa-kernel/isa/es1688/es1688_lib.c (modified) (23 diffs)
• alsa-kernel/isa/es18xx.c (modified) (77 diffs)
• alsa-kernel/isa/gus/gus_dma.c (modified) (2 diffs)
• alsa-kernel/isa/gus/gus_dram.c (modified) (1 diff)
• alsa-kernel/isa/gus/gus_io.c (modified) (3 diffs)
• alsa-kernel/isa/gus/gus_irq.c (modified) (2 diffs)
• alsa-kernel/isa/gus/gus_main.c (modified) (9 diffs)
• alsa-kernel/isa/gus/gus_mem.c (modified) (4 diffs)
• alsa-kernel/isa/gus/gus_mem_proc.c (modified) (2 diffs)
• alsa-kernel/isa/gus/gus_mixer.c (modified) (5 diffs)
• alsa-kernel/isa/gus/gus_pcm.c (modified) (20 diffs)
• alsa-kernel/isa/gus/gus_reset.c (modified) (4 diffs)
• alsa-kernel/isa/gus/gus_tables.h (modified) (1 diff)
• alsa-kernel/isa/gus/gus_timer.c (modified) (4 diffs)
• alsa-kernel/isa/gus/gus_uart.c (modified) (6 diffs)
• alsa-kernel/isa/gus/gus_volume.c (modified) (5 diffs)
• alsa-kernel/isa/gus/gusclassic.c (modified) (13 diffs)
• alsa-kernel/isa/gus/gusextreme.c (modified) (17 diffs)
• alsa-kernel/isa/gus/gusmax.c (modified) (19 diffs)
• alsa-kernel/isa/gus/interwave.c (modified) (36 diffs)
• alsa-kernel/isa/opl3sa2.c (modified) (34 diffs)
• alsa-kernel/isa/opti9xx/opti92x-ad1848.c (modified) (41 diffs)
• alsa-kernel/isa/sb/emu8000.c (modified) (33 diffs)
• alsa-kernel/isa/sb/emu8000_callback.c (modified) (7 diffs)
• alsa-kernel/isa/sb/emu8000_local.h (modified) (2 diffs)
• alsa-kernel/isa/sb/emu8000_patch.c (modified) (4 diffs)
• alsa-kernel/isa/sb/emu8000_pcm.c (copied) (copied from GPL/branches/uniaud32-next/alsa-kernel/isa/sb/emu8000_pcm.c )
• alsa-kernel/isa/sb/emu8000_synth.c (modified) (6 diffs)
• alsa-kernel/isa/sb/jazz16.c (copied) (copied from GPL/branches/uniaud32-next/alsa-kernel/isa/sb/jazz16.c )
• alsa-kernel/isa/sb/sb16.c (modified) (23 diffs)
• alsa-kernel/isa/sb/sb16_csp.c (modified) (23 diffs)
• alsa-kernel/isa/sb/sb16_main.c (modified) (17 diffs)
• alsa-kernel/isa/sb/sb8.c (modified) (16 diffs)
• alsa-kernel/isa/sb/sb8_main.c (modified) (20 diffs)
• alsa-kernel/isa/sb/sb8_midi.c (modified) (9 diffs)
• alsa-kernel/isa/sb/sb_common.c (modified) (9 diffs)
• alsa-kernel/isa/sb/sb_mixer.c (modified) (24 diffs)
• alsa-kernel/isa/sc6000.c (copied) (copied from GPL/branches/uniaud32-next/alsa-kernel/isa/sc6000.c )
• alsa-kernel/isa/sscape.c (copied) (copied from GPL/branches/uniaud32-next/alsa-kernel/isa/sscape.c )
• alsa-kernel/isa/wavefront/wavefront.c (modified) (27 diffs)
• alsa-kernel/isa/wavefront/wavefront_fx.c (modified) (6 diffs)
• alsa-kernel/isa/wavefront/wavefront_midi.c (modified) (8 diffs)
• alsa-kernel/isa/wavefront/wavefront_synth.c (modified) (28 diffs)

GPL/trunk/alsa-kernel/isa/Makefile

@@ -7 +7 @@
 !include $(ROOT)\tools\header.mif
 
-WMAKEOPTS=-h $(__MAKEOPTS__) KEE=$(KEE) DEBUG=$(DEBUG)
+WMAKEOPTS=-h $(__MAKEOPTS__) DEBUG=$(DEBUG)
 
 

GPL/trunk/alsa-kernel/isa/ad1816a/ad1816a.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 /*
@@ -4 +5 @@
     Copyright (C) 2000 by Massimo Piccioni <dafastidio@libero.it>
 
-    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
 */
 
@@ -23 +11 @@
 #include <linux/wait.h>
 #include <linux/pnp.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <sound/core.h>
 #include <sound/initval.h>
@@ -45 +33 @@
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;      /* Index 1-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 */
 static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;     /* PnP setup */
 static long mpu_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* PnP setup */
@@ -64 +52 @@
 MODULE_PARM_DESC(clockfreq, "Clock frequency for ad1816a driver (default = 0).");
 
-struct snd_card_ad1816a {
-        struct pnp_dev *dev;
-        struct pnp_dev *devmpu;
-};
-
-static struct pnp_card_device_id snd_ad1816a_pnpids[] = {
+static const struct pnp_card_device_id snd_ad1816a_pnpids[] = {
         /* Analog Devices AD1815 */
         { .id = "ADS7150", .devs = { { .id = "ADS7150" }, { .id = "ADS7151" } } },
-        /* Analog Device AD1816? */
+        /* Analog Devices AD1816? */
         { .id = "ADS7180", .devs = { { .id = "ADS7180" }, { .id = "ADS7181" } } },
         /* Analog Devices AD1816A - added by Kenneth Platz <kxp@atl.hp.com> */
@@ -100 +83 @@
 
 
-static int __devinit snd_card_ad1816a_pnp(int dev, struct snd_card_ad1816a *acard,
-                                          struct pnp_card_link *card,
-                                          const struct pnp_card_device_id *id)
+static int snd_card_ad1816a_pnp(int dev, struct pnp_card_link *card,
+                                const struct pnp_card_device_id *id)
 {
         struct pnp_dev *pdev;
         int err;
 
-        acard->dev = pnp_request_card_device(card, id->devs[0].id, NULL);
-        if (acard->dev == NULL)
+        pdev = pnp_request_card_device(card, id->devs[0].id, NULL);
+        if (pdev == NULL)
                 return -EBUSY;
-
-        acard->devmpu = pnp_request_card_device(card, id->devs[1].id, NULL);
-        if (acard->devmpu == NULL) {
-                mpu_port[dev] = -1;
-                snd_printk(KERN_WARNING PFX "MPU401 device busy, skipping.\n");
-        }
-
-        pdev = acard->dev;
 
         err = pnp_activate_dev(pdev);
@@ -131 +105 @@
         irq[dev] = pnp_irq(pdev, 0);
 
-        if (acard->devmpu == NULL)
+        pdev = pnp_request_card_device(card, id->devs[1].id, NULL);
+        if (pdev == NULL) {
+                mpu_port[dev] = -1;
+                snd_printk(KERN_WARNING PFX "MPU401 device busy, skipping.\n");
                 return 0;
-
-        pdev = acard->devmpu;
+        }
 
         err = pnp_activate_dev(pdev);
@@ -140 +116 @@
                 printk(KERN_ERR PFX "MPU401 PnP configure failure\n");
                 mpu_port[dev] = -1;
-                acard->devmpu = NULL;
         } else {
                 mpu_port[dev] = pnp_port_start(pdev, 0);
@@ -149 +124 @@
 }
 
-static int __devinit snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard,
-                                            const struct pnp_card_device_id *pid)
+static int snd_card_ad1816a_probe(int dev, struct pnp_card_link *pcard,
+                                  const struct pnp_card_device_id *pid)
 {
         int error;
         struct snd_card *card;
-        struct snd_card_ad1816a *acard;
         struct snd_ad1816a *chip;
         struct snd_opl3 *opl3;
-        struct snd_timer *timer;
-
-        error = snd_card_create(index[dev], id[dev], THIS_MODULE,
-                                sizeof(struct snd_card_ad1816a), &card);
+
+        error = snd_card_new(&pcard->card->dev,
+                             index[dev], id[dev], THIS_MODULE,
+                             sizeof(struct snd_ad1816a), &card);
         if (error < 0)
                 return error;
-        acard = card->private_data;
-
-        if ((error = snd_card_ad1816a_pnp(dev, acard, pcard, pid))) {
-                snd_card_free(card);
-                return error;
-        }
-        snd_card_set_dev(card, &pcard->card->dev);
+        chip = card->private_data;
+
+        if ((error = snd_card_ad1816a_pnp(dev, pcard, pid))) {
+                snd_card_free(card);
+                return error;
+        }
 
         if ((error = snd_ad1816a_create(card, port[dev],
@@ -175 +148 @@
                                         dma1[dev],
                                         dma2[dev],
-                                        &chip)) < 0) {
+                                        chip)) < 0) {
                 snd_card_free(card);
                 return error;
@@ -187 +160 @@
                 card->shortname, chip->port, irq[dev], dma1[dev], dma2[dev]);
 
-        if ((error = snd_ad1816a_pcm(chip, 0, NULL)) < 0) {
+        if ((error = snd_ad1816a_pcm(chip, 0)) < 0) {
                 snd_card_free(card);
                 return error;
@@ -197 +170 @@
         }
 
-        error = snd_ad1816a_timer(chip, 0, &timer);
+        error = snd_ad1816a_timer(chip, 0);
         if (error < 0) {
                 snd_card_free(card);
@@ -205 +178 @@
         if (mpu_port[dev] > 0) {
                 if (snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
-                                        mpu_port[dev], 0, mpu_irq[dev], IRQF_DISABLED,
+                                        mpu_port[dev], 0, mpu_irq[dev],
                                         NULL) < 0)
                         printk(KERN_ERR PFX "no MPU-401 device at 0x%lx.\n", mpu_port[dev]);
@@ -232 +205 @@
 }
 
-static unsigned int __devinitdata ad1816a_devices;
-
-static int __devinit snd_ad1816a_pnp_detect(struct pnp_card_link *card,
-                                            const struct pnp_card_device_id *id)
+static unsigned int ad1816a_devices;
+
+static int snd_ad1816a_pnp_detect(struct pnp_card_link *card,
+                                  const struct pnp_card_device_id *id)
 {
         static int dev;
@@ -253 +226 @@
 }
 
-static void __devexit snd_ad1816a_pnp_remove(struct pnp_card_link * pcard)
+static void snd_ad1816a_pnp_remove(struct pnp_card_link *pcard)
 {
         snd_card_free(pnp_get_card_drvdata(pcard));
         pnp_set_card_drvdata(pcard, NULL);
 }
+
+#ifdef CONFIG_PM
+static int snd_ad1816a_pnp_suspend(struct pnp_card_link *pcard,
+                                   pm_message_t state)
+{
+        struct snd_card *card = pnp_get_card_drvdata(pcard);
+
+        snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
+        snd_ad1816a_suspend(card->private_data);
+        return 0;
+}
+
+static int snd_ad1816a_pnp_resume(struct pnp_card_link *pcard)
+{
+        struct snd_card *card = pnp_get_card_drvdata(pcard);
+
+        snd_ad1816a_resume(card->private_data);
+        snd_power_change_state(card, SNDRV_CTL_POWER_D0);
+        return 0;
+}
+#endif
 
 static struct pnp_card_driver ad1816a_pnpc_driver = {
@@ -264 +258 @@
         .id_table       = snd_ad1816a_pnpids,
         .probe          = snd_ad1816a_pnp_detect,
-        .remove         = __devexit_p(snd_ad1816a_pnp_remove),
-        /* FIXME: suspend/resume */
+        .remove         = snd_ad1816a_pnp_remove,
+#ifdef CONFIG_PM
+        .suspend        = snd_ad1816a_pnp_suspend,
+        .resume         = snd_ad1816a_pnp_resume,
+#endif
 };
 

GPL/trunk/alsa-kernel/isa/ad1816a/ad1816a_lib.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
     ad1816a.c - lowlevel code for Analog Devices AD1816A chip.
     Copyright (C) 1999-2000 by Massimo Piccioni <dafastidio@libero.it>
 
-    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
 */
 
@@ -23 +11 @@
 #include <linux/slab.h>
 #include <linux/ioport.h>
+#include <linux/io.h>
 #include <sound/core.h>
 #include <sound/tlv.h>
 #include <sound/ad1816a.h>
 
-#include <asm/io.h>
 #include <asm/dma.h>
 
@@ -86 +74 @@
 
 static unsigned char snd_ad1816a_get_format(struct snd_ad1816a *chip,
-                                            unsigned int format, int channels)
+                                            snd_pcm_format_t format,
+                                            int channels)
 {
         unsigned char retval = AD1816A_FMT_LINEAR_8;
@@ -218 +207 @@
 }
 
-static int snd_ad1816a_hw_params(struct snd_pcm_substream *substream,
-                                 struct snd_pcm_hw_params *hw_params)
-{
-        return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
-}
-
-static int snd_ad1816a_hw_free(struct snd_pcm_substream *substream)
-{
-        return snd_pcm_lib_free_pages(substream);
-}
-
 static int snd_ad1816a_playback_prepare(struct snd_pcm_substream *substream)
 {
@@ -340 +318 @@
 
 
-static struct snd_pcm_hardware snd_ad1816a_playback = {
+static const struct snd_pcm_hardware snd_ad1816a_playback = {
         .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
                                  SNDRV_PCM_INFO_MMAP_VALID),
@@ -359 +337 @@
 };
 
-static struct snd_pcm_hardware snd_ad1816a_capture = {
+static const struct snd_pcm_hardware snd_ad1816a_capture = {
         .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
                                  SNDRV_PCM_INFO_MMAP_VALID),
@@ -432 +410 @@
 }
 
-static struct snd_timer_hardware snd_ad1816a_timer_table = {
+static const struct snd_timer_hardware snd_ad1816a_timer_table = {
         .flags =        SNDRV_TIMER_HW_AUTO,
         .resolution =   10000,
@@ -492 +470 @@
 
 
-static void __devinit snd_ad1816a_init(struct snd_ad1816a *chip)
+static void snd_ad1816a_init(struct snd_ad1816a *chip)
 {
         unsigned long flags;
@@ -512 +490 @@
 }
 
-static int __devinit snd_ad1816a_probe(struct snd_ad1816a *chip)
+#ifdef CONFIG_PM
+void snd_ad1816a_suspend(struct snd_ad1816a *chip)
+{
+        int reg;
+        unsigned long flags;
+
+        spin_lock_irqsave(&chip->lock, flags);
+        for (reg = 0; reg < 48; reg++)
+                chip->image[reg] = snd_ad1816a_read(chip, reg);
+        spin_unlock_irqrestore(&chip->lock, flags);
+}
+
+void snd_ad1816a_resume(struct snd_ad1816a *chip)
+{
+        int reg;
+        unsigned long flags;
+
+        snd_ad1816a_init(chip);
+        spin_lock_irqsave(&chip->lock, flags);
+        for (reg = 0; reg < 48; reg++)
+                snd_ad1816a_write(chip, reg, chip->image[reg]);
+        spin_unlock_irqrestore(&chip->lock, flags);
+}
+#endif
+
+static int snd_ad1816a_probe(struct snd_ad1816a *chip)
 {
         unsigned long flags;
@@ -549 +552 @@
                 free_dma(chip->dma2);
         }
-        kfree(chip);
         return 0;
 }
@@ -559 +561 @@
 }
 
-static const char __devinit *snd_ad1816a_chip_id(struct snd_ad1816a *chip)
+static const char *snd_ad1816a_chip_id(struct snd_ad1816a *chip)
 {
         switch (chip->hardware) {
@@ -572 +574 @@
 }
 
-int __devinit snd_ad1816a_create(struct snd_card *card,
-                                 unsigned long port, int irq, int dma1, int dma2,
-                                 struct snd_ad1816a **rchip)
-{
-        static struct snd_device_ops ops = {
+int snd_ad1816a_create(struct snd_card *card,
+                       unsigned long port, int irq, int dma1, int dma2,
+                       struct snd_ad1816a *chip)
+{
+        static const struct snd_device_ops ops = {
                 .dev_free =     snd_ad1816a_dev_free,
         };
         int error;
-        struct snd_ad1816a *chip;
-
-        *rchip = NULL;
-
-        chip = kzalloc(sizeof(*chip), GFP_KERNEL);
-        if (chip == NULL)
-                return -ENOMEM;
+
         chip->irq = -1;
         chip->dma1 = -1;
@@ -596 +592 @@
                 return -EBUSY;
         }
-        if (request_irq(irq, snd_ad1816a_interrupt, IRQF_DISABLED, "AD1816A", (void *) chip)) {
+        if (request_irq(irq, snd_ad1816a_interrupt, 0, "AD1816A", (void *) chip)) {
                 snd_printk(KERN_ERR "ad1816a: can't grab IRQ %d\n", irq);
                 snd_ad1816a_free(chip);
@@ -602 +598 @@
         }
         chip->irq = irq;
+        card->sync_irq = chip->irq;
         if (request_dma(dma1, "AD1816A - 1")) {
                 snd_printk(KERN_ERR "ad1816a: can't grab DMA1 %d\n", dma1);
@@ -632 +629 @@
         }
 
-        *rchip = chip;
-        return 0;
-}
-
-static struct snd_pcm_ops snd_ad1816a_playback_ops = {
+        return 0;
+}
+
+static const struct snd_pcm_ops snd_ad1816a_playback_ops = {
         .open =         snd_ad1816a_playback_open,
         .close =        snd_ad1816a_playback_close,
-        .ioctl =        snd_pcm_lib_ioctl,
-        .hw_params =    snd_ad1816a_hw_params,
-        .hw_free =      snd_ad1816a_hw_free,
         .prepare =      snd_ad1816a_playback_prepare,
         .trigger =      snd_ad1816a_playback_trigger,
@@ -647 +640 @@
 };
 
-static struct snd_pcm_ops snd_ad1816a_capture_ops = {
+static const struct snd_pcm_ops snd_ad1816a_capture_ops = {
         .open =         snd_ad1816a_capture_open,
         .close =        snd_ad1816a_capture_close,
-        .ioctl =        snd_pcm_lib_ioctl,
-        .hw_params =    snd_ad1816a_hw_params,
-        .hw_free =      snd_ad1816a_hw_free,
         .prepare =      snd_ad1816a_capture_prepare,
         .trigger =      snd_ad1816a_capture_trigger,
@@ -658 +648 @@
 };
 
-int __devinit snd_ad1816a_pcm(struct snd_ad1816a *chip, int device, struct snd_pcm **rpcm)
+int snd_ad1816a_pcm(struct snd_ad1816a *chip, int device)
 {
         int error;
@@ -675 +665 @@
         snd_ad1816a_init(chip);
 
-        snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
-                                              snd_dma_isa_data(),
-                                              64*1024, chip->dma1 > 3 || chip->dma2 > 3 ? 128*1024 : 64*1024);
+        snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV, chip->card->dev,
+                                       64*1024, chip->dma1 > 3 || chip->dma2 > 3 ? 128*1024 : 64*1024);
 
         chip->pcm = pcm;
-        if (rpcm)
-                *rpcm = pcm;
-        return 0;
-}
-
-int __devinit snd_ad1816a_timer(struct snd_ad1816a *chip, int device, struct snd_timer **rtimer)
+        return 0;
+}
+
+int snd_ad1816a_timer(struct snd_ad1816a *chip, int device)
 {
         struct snd_timer *timer;
@@ -702 +689 @@
         chip->timer = timer;
         timer->hw = snd_ad1816a_timer_table;
-        if (rtimer)
-                *rtimer = timer;
         return 0;
 }
@@ -713 +698 @@
 static int snd_ad1816a_info_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
-        static char *texts[8] = {
+        static const char * const texts[8] = {
                 "Line", "Mix", "CD", "Synth", "Video",
                 "Mic", "Phone",
         };
 
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        uinfo->count = 2;
-        uinfo->value.enumerated.items = 7;
-        if (uinfo->value.enumerated.item > 6)
-                uinfo->value.enumerated.item = 6;
-        strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
-        return 0;
+        return snd_ctl_enum_info(uinfo, 2, 7, texts);
 }
 
@@ -906 +885 @@
 static const DECLARE_TLV_DB_SCALE(db_scale_rec_gain, 0, 150, 0);
 
-static struct snd_kcontrol_new snd_ad1816a_controls[] __devinitdata = {
+static const struct snd_kcontrol_new snd_ad1816a_controls[] = {
 AD1816A_DOUBLE("Master Playback Switch", AD1816A_MASTER_ATT, 15, 7, 1, 1),
 AD1816A_DOUBLE_TLV("Master Playback Volume", AD1816A_MASTER_ATT, 8, 0, 31, 1,
@@ -952 +931 @@
 };
                                         
-int __devinit snd_ad1816a_mixer(struct snd_ad1816a *chip)
+int snd_ad1816a_mixer(struct snd_ad1816a *chip)
 {
         struct snd_card *card;

GPL/trunk/alsa-kernel/isa/ad1848/ad1848.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Generic driver for AD1848/AD1847/CS4248 chips (0.1 Alpha)
@@ -4 +5 @@
  *                   Jaroslav Kysela <perex@perex.cz>
  *  Based on card-4232.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
- *
  */
 
@@ -27 +12 @@
 #include <linux/time.h>
 #include <linux/wait.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <sound/core.h>
 #include <sound/wss.h>
@@ -44 +29 @@
 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;     /* PnP setup */
 static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ;        /* 5,7,9,11,12,15 */
 static int dma1[SNDRV_CARDS] = SNDRV_DEFAULT_DMA;       /* 0,1,3,5,6,7 */
-static int thinkpad[SNDRV_CARDS];                       /* Thinkpad special case */
+static bool thinkpad[SNDRV_CARDS];                      /* Thinkpad special case */
 
 module_param_array(index, int, NULL, 0444);
@@ -56 +41 @@
 module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable " CRD_NAME " soundcard.");
-module_param_array(port, long, NULL, 0444);
+module_param_hw_array(port, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(port, "Port # for " CRD_NAME " driver.");
-module_param_array(irq, int, NULL, 0444);
+module_param_hw_array(irq, int, irq, NULL, 0444);
 MODULE_PARM_DESC(irq, "IRQ # for " CRD_NAME " driver.");
-module_param_array(dma1, int, NULL, 0444);
+module_param_hw_array(dma1, int, dma, NULL, 0444);
 MODULE_PARM_DESC(dma1, "DMA1 # for " CRD_NAME " driver.");
 module_param_array(thinkpad, bool, NULL, 0444);
 MODULE_PARM_DESC(thinkpad, "Enable only for the onboard CS4248 of IBM Thinkpad 360/750/755 series.");
 
-static int __devinit snd_ad1848_match(struct device *dev, unsigned int n)
+static int snd_ad1848_match(struct device *dev, unsigned int n)
 {
         if (!enable[n])
@@ -85 +70 @@
 }
 
-static int __devinit snd_ad1848_probe(struct device *dev, unsigned int n)
+static int snd_ad1848_probe(struct device *dev, unsigned int n)
 {
         struct snd_card *card;
         struct snd_wss *chip;
-        struct snd_pcm *pcm;
         int error;
 
-        error = snd_card_create(index[n], id[n], THIS_MODULE, 0, &card);
+        error = snd_card_new(dev, index[n], id[n], THIS_MODULE, 0, &card);
         if (error < 0)
                 return error;
@@ -104 +88 @@
         card->private_data = chip;
 
-        error = snd_wss_pcm(chip, 0, &pcm);
+        error = snd_wss_pcm(chip, 0);
         if (error < 0)
                 goto out;
@@ -112 +96 @@
                 goto out;
 
-        strcpy(card->driver, "AD1848");
-        strcpy(card->shortname, pcm->name);
+        strlcpy(card->driver, "AD1848", sizeof(card->driver));
+        strlcpy(card->shortname, chip->pcm->name, sizeof(card->shortname));
 
-        sprintf(card->longname, "%s at 0x%lx, irq %d, dma %d",
-                pcm->name, chip->port, irq[n], dma1[n]);
-        if (thinkpad[n])
-                strcat(card->longname, " [Thinkpad]");
-
-        snd_card_set_dev(card, dev);
+        if (!thinkpad[n])
+                snprintf(card->longname, sizeof(card->longname),
+                         "%s at 0x%lx, irq %d, dma %d",
+                         chip->pcm->name, chip->port, irq[n], dma1[n]);
+        else
+                snprintf(card->longname, sizeof(card->longname),
+                         "%s at 0x%lx, irq %d, dma %d [Thinkpad]",
+                         chip->pcm->name, chip->port, irq[n], dma1[n]);
 
         error = snd_card_register(card);
@@ -133 +119 @@
 }
 
-static int __devexit snd_ad1848_remove(struct device *dev, unsigned int n)
+static int snd_ad1848_remove(struct device *dev, unsigned int n)
 {
         snd_card_free(dev_get_drvdata(dev));
-        dev_set_drvdata(dev, NULL);
         return 0;
 }
@@ -165 +150 @@
         .match          = snd_ad1848_match,
         .probe          = snd_ad1848_probe,
-        .remove         = __devexit_p(snd_ad1848_remove),
+        .remove         = snd_ad1848_remove,
 #ifdef CONFIG_PM
         .suspend        = snd_ad1848_suspend,
@@ -175 +160 @@
 };
 
-static int __init alsa_card_ad1848_init(void)
-{
-        return isa_register_driver(&snd_ad1848_driver, SNDRV_CARDS);
-}
-
-static void __exit alsa_card_ad1848_exit(void)
-{
-        isa_unregister_driver(&snd_ad1848_driver);
-}
-
-module_init(alsa_card_ad1848_init);
-module_exit(alsa_card_ad1848_exit);
+module_isa_driver(snd_ad1848_driver, SNDRV_CARDS);

GPL/trunk/alsa-kernel/isa/als100.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 /*
@@ -8 +9 @@
 
     Generalised for soundcards based on DT-0196 and ALS-007 chips
-    by Jonathan Woithe <jwoithe@physics.adelaide.edu.au>: June 2002.
-
-    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
+    by Jonathan Woithe <jwoithe@just42.net>: June 2002.
+
 */
 
@@ -29 +17 @@
 #include <linux/time.h>
 #include <linux/pnp.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <sound/core.h>
 #include <sound/initval.h>
@@ -55 +43 @@
 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;     /* PnP setup */
 static long mpu_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* PnP setup */
@@ -80 +68 @@
 };
 
-static struct pnp_card_device_id snd_als100_pnpids[] = {
+static const struct pnp_card_device_id snd_als100_pnpids[] = {
         /* DT197A30 */
         { .id = "RWB1688",
@@ -118 +106 @@
 MODULE_DEVICE_TABLE(pnp_card, snd_als100_pnpids);
 
-static int __devinit snd_card_als100_pnp(int dev, struct snd_card_als100 *acard,
-                                         struct pnp_card_link *card,
-                                         const struct pnp_card_device_id *id)
+static int snd_card_als100_pnp(int dev, struct snd_card_als100 *acard,
+                               struct pnp_card_link *card,
+                               const struct pnp_card_device_id *id)
 {
         struct pnp_dev *pdev;
@@ -184 +172 @@
 }
 
-static int __devinit snd_card_als100_probe(int dev,
-                                        struct pnp_card_link *pcard,
-                                        const struct pnp_card_device_id *pid)
+static int snd_card_als100_probe(int dev,
+                                 struct pnp_card_link *pcard,
+                                 const struct pnp_card_device_id *pid)
 {
         int error;
@@ -194 +182 @@
         struct snd_opl3 *opl3;
 
-        error = snd_card_create(index[dev], id[dev], THIS_MODULE,
-                                sizeof(struct snd_card_als100), &card);
+        error = snd_card_new(&pcard->card->dev,
+                             index[dev], id[dev], THIS_MODULE,
+                             sizeof(struct snd_card_als100), &card);
         if (error < 0)
                 return error;
@@ -204 +193 @@
                 return error;
         }
-        snd_card_set_dev(card, &pcard->card->dev);
 
         if (pid->driver_data == SB_HW_DT019X)
@@ -223 +211 @@
                 strcpy(card->driver, "DT-019X");
                 strcpy(card->shortname, "Diamond Tech. DT-019X");
-                sprintf(card->longname, "%s, %s at 0x%lx, irq %d, dma %d",
-                        card->shortname, chip->name, chip->port,
-                        irq[dev], dma8[dev]);
+                snprintf(card->longname, sizeof(card->longname),
+                         "Diamond Tech. DT-019X, %s at 0x%lx, irq %d, dma %d",
+                         chip->name, chip->port, irq[dev], dma8[dev]);
         } else {
                 strcpy(card->driver, "ALS100");
                 strcpy(card->shortname, "Avance Logic ALS100");
-                sprintf(card->longname, "%s, %s at 0x%lx, irq %d, dma %d&%d",
-                        card->shortname, chip->name, chip->port,
-                        irq[dev], dma8[dev], dma16[dev]);
-        }
-
-        if ((error = snd_sb16dsp_pcm(chip, 0, NULL)) < 0) {
+                snprintf(card->longname, sizeof(card->longname),
+                         "Avance Logic ALS100, %s at 0x%lx, irq %d, dma %d&%d",
+                         chip->name, chip->port, irq[dev], dma8[dev],
+                         dma16[dev]);
+        }
+
+        if ((error = snd_sb16dsp_pcm(chip, 0)) < 0) {
                 snd_card_free(card);
                 return error;
@@ -257 +246 @@
                                         mpu_port[dev], 0, 
                                         mpu_irq[dev],
-                                        mpu_irq[dev] >= 0 ? IRQF_DISABLED : 0,
                                         NULL) < 0)
                         snd_printk(KERN_ERR PFX "no MPU-401 device at 0x%lx\n", mpu_port[dev]);
@@ -288 +276 @@
 }
 
-static unsigned int __devinitdata als100_devices;
-
-static int __devinit snd_als100_pnp_detect(struct pnp_card_link *card,
-                                           const struct pnp_card_device_id *id)
+static unsigned int als100_devices;
+
+static int snd_als100_pnp_detect(struct pnp_card_link *card,
+                                 const struct pnp_card_device_id *id)
 {
         static int dev;
@@ -309 +297 @@
 }
 
-static void __devexit snd_als100_pnp_remove(struct pnp_card_link * pcard)
+static void snd_als100_pnp_remove(struct pnp_card_link *pcard)
 {
         snd_card_free(pnp_get_card_drvdata(pcard));
@@ -323 +311 @@
 
         snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
-        snd_pcm_suspend_all(chip->pcm);
         snd_sbmixer_suspend(chip);
         return 0;
@@ -346 +333 @@
         .id_table       = snd_als100_pnpids,
         .probe          = snd_als100_pnp_detect,
-        .remove         = __devexit_p(snd_als100_pnp_remove),
+        .remove         = snd_als100_pnp_remove,
 #ifdef CONFIG_PM
         .suspend        = snd_als100_pnp_suspend,

GPL/trunk/alsa-kernel/isa/azt2320.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
     card-azt2320.c - driver for Aztech Systems AZT2320 based soundcards.
     Copyright (C) 1999-2000 by Massimo Piccioni <dafastidio@libero.it>
 
-    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
 */
 
@@ -30 +18 @@
 */
 
-#include <asm/io.h>
+#include <linux/io.h>
 #include <linux/delay.h>
 #include <linux/init.h>
@@ -36 +24 @@
 #include <linux/wait.h>
 #include <linux/pnp.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <sound/core.h>
 #include <sound/initval.h>
@@ -56 +44 @@
 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 */
 static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;     /* PnP setup */
 static long wss_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* PnP setup */
@@ -80 +68 @@
 };
 
-static struct pnp_card_device_id snd_azt2320_pnpids[] = {
+static const struct pnp_card_device_id snd_azt2320_pnpids[] = {
         /* PRO16V */
         { .id = "AZT1008", .devs = { { "AZT1008" }, { "AZT2001" }, } },
@@ -100 +88 @@
 #define DRIVER_NAME     "snd-card-azt2320"
 
-static int __devinit snd_card_azt2320_pnp(int dev, struct snd_card_azt2320 *acard,
-                                          struct pnp_card_link *card,
-                                          const struct pnp_card_device_id *id)
+static int snd_card_azt2320_pnp(int dev, struct snd_card_azt2320 *acard,
+                                struct pnp_card_link *card,
+                                const struct pnp_card_device_id *id)
 {
         struct pnp_dev *pdev;
@@ -148 +136 @@
 
 /* same of snd_sbdsp_command by Jaroslav Kysela */
-static int __devinit snd_card_azt2320_command(unsigned long port, unsigned char val)
+static int snd_card_azt2320_command(unsigned long port, unsigned char val)
 {
         int i;
@@ -162 +150 @@
 }
 
-static int __devinit snd_card_azt2320_enable_wss(unsigned long port)
+static int snd_card_azt2320_enable_wss(unsigned long port)
 {
         int error;
@@ -175 +163 @@
 }
 
-static int __devinit snd_card_azt2320_probe(int dev,
-                                            struct pnp_card_link *pcard,
-                                            const struct pnp_card_device_id *pid)
+static int snd_card_azt2320_probe(int dev,
+                                  struct pnp_card_link *pcard,
+                                  const struct pnp_card_device_id *pid)
 {
         int error;
@@ -185 +173 @@
         struct snd_opl3 *opl3;
 
-        error = snd_card_create(index[dev], id[dev], THIS_MODULE,
-                                sizeof(struct snd_card_azt2320), &card);
+        error = snd_card_new(&pcard->card->dev,
+                             index[dev], id[dev], THIS_MODULE,
+                             sizeof(struct snd_card_azt2320), &card);
         if (error < 0)
                 return error;
@@ -195 +184 @@
                 return error;
         }
-        snd_card_set_dev(card, &pcard->card->dev);
 
         if ((error = snd_card_azt2320_enable_wss(port[dev]))) {
@@ -216 +204 @@
                 card->shortname, chip->port, irq[dev], dma1[dev], dma2[dev]);
 
-        error = snd_wss_pcm(chip, 0, NULL);
+        error = snd_wss_pcm(chip, 0);
         if (error < 0) {
                 snd_card_free(card);
@@ -226 +214 @@
                 return error;
         }
-        error = snd_wss_timer(chip, 0, NULL);
+        error = snd_wss_timer(chip, 0);
         if (error < 0) {
                 snd_card_free(card);
@@ -235 +223 @@
                 if (snd_mpu401_uart_new(card, 0, MPU401_HW_AZT2320,
                                 mpu_port[dev], 0,
-                                mpu_irq[dev], IRQF_DISABLED,
-                                NULL) < 0)
+                                mpu_irq[dev], NULL) < 0)
                         snd_printk(KERN_ERR PFX "no MPU-401 device at 0x%lx\n", mpu_port[dev]);
         }
@@ -266 +253 @@
 }
 
-static unsigned int __devinitdata azt2320_devices;
-
-static int __devinit snd_azt2320_pnp_detect(struct pnp_card_link *card,
-                                            const struct pnp_card_device_id *id)
+static unsigned int azt2320_devices;
+
+static int snd_azt2320_pnp_detect(struct pnp_card_link *card,
+                                  const struct pnp_card_device_id *id)
 {
         static int dev;
@@ -287 +274 @@
 }
 
-static void __devexit snd_azt2320_pnp_remove(struct pnp_card_link * pcard)
+static void snd_azt2320_pnp_remove(struct pnp_card_link *pcard)
 {
         snd_card_free(pnp_get_card_drvdata(pcard));
@@ -322 +309 @@
         .id_table       = snd_azt2320_pnpids,
         .probe          = snd_azt2320_pnp_detect,
-        .remove         = __devexit_p(snd_azt2320_pnp_remove),
+        .remove         = snd_azt2320_pnp_remove,
 #ifdef CONFIG_PM
         .suspend        = snd_azt2320_pnp_suspend,

GPL/trunk/alsa-kernel/isa/cmi8330.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Driver for C-Media's CMI8330 and CMI8329 soundcards.
  *  Copyright (c) by George Talusan <gstalusan@uwaterloo.ca>
  *    http://www.undergrad.math.uwaterloo.ca/~gstalusa
- *
- *   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
- *
  */
 
@@ -48 +34 @@
 #include <linux/isa.h>
 #include <linux/pnp.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <sound/core.h>
 #include <sound/wss.h>
@@ -70 +56 @@
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP;
-#ifdef CONFIG_PNP
-static int isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP;
+#ifdef CONFIG_PNP
+static bool isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
 #endif
 static long sbport[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;
@@ -96 +82 @@
 #endif
 
-module_param_array(sbport, long, NULL, 0444);
+module_param_hw_array(sbport, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(sbport, "Port # for CMI8330/CMI8329 SB driver.");
-module_param_array(sbirq, int, NULL, 0444);
+module_param_hw_array(sbirq, int, irq, NULL, 0444);
 MODULE_PARM_DESC(sbirq, "IRQ # for CMI8330/CMI8329 SB driver.");
-module_param_array(sbdma8, int, NULL, 0444);
+module_param_hw_array(sbdma8, int, dma, NULL, 0444);
 MODULE_PARM_DESC(sbdma8, "DMA8 for CMI8330/CMI8329 SB driver.");
-module_param_array(sbdma16, int, NULL, 0444);
+module_param_hw_array(sbdma16, int, dma, NULL, 0444);
 MODULE_PARM_DESC(sbdma16, "DMA16 for CMI8330/CMI8329 SB driver.");
 
-module_param_array(wssport, long, NULL, 0444);
+module_param_hw_array(wssport, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(wssport, "Port # for CMI8330/CMI8329 WSS driver.");
-module_param_array(wssirq, int, NULL, 0444);
+module_param_hw_array(wssirq, int, irq, NULL, 0444);
 MODULE_PARM_DESC(wssirq, "IRQ # for CMI8330/CMI8329 WSS driver.");
-module_param_array(wssdma, int, NULL, 0444);
+module_param_hw_array(wssdma, int, dma, NULL, 0444);
 MODULE_PARM_DESC(wssdma, "DMA for CMI8330/CMI8329 WSS driver.");
 
-module_param_array(fmport, long, NULL, 0444);
+module_param_hw_array(fmport, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(fmport, "FM port # for CMI8330/CMI8329 driver.");
-module_param_array(mpuport, long, NULL, 0444);
+module_param_hw_array(mpuport, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(mpuport, "MPU-401 port # for CMI8330/CMI8329 driver.");
-module_param_array(mpuirq, int, NULL, 0444);
+module_param_hw_array(mpuirq, int, irq, NULL, 0444);
 MODULE_PARM_DESC(mpuirq, "IRQ # for CMI8330/CMI8329 MPU-401 port.");
 #ifdef CONFIG_PNP
@@ -135 +121 @@
 #define CMI8330_CDINGAIN  26
 
-static unsigned char snd_cmi8330_image[((CMI8330_CDINGAIN)-16) + 1] =
+static const unsigned char snd_cmi8330_image[((CMI8330_CDINGAIN)-16) + 1] =
 {
         0x40,                   /* 16 - recording mux (SB-mixer-enabled) */
@@ -183 +169 @@
 #ifdef CONFIG_PNP
 
-static struct pnp_card_device_id snd_cmi8330_pnpids[] = {
+static const struct pnp_card_device_id snd_cmi8330_pnpids[] = {
         { .id = "CMI0001", .devs = { { "@X@0001" }, { "@@@0001" }, { "@H@0001" }, { "A@@0001" } } },
         { .id = "CMI0001", .devs = { { "@@@0001" }, { "@X@0001" }, { "@H@0001" } } },
@@ -194 +180 @@
 
 
-static struct snd_kcontrol_new snd_cmi8330_controls[] __devinitdata = {
+static const struct snd_kcontrol_new snd_cmi8330_controls[] = {
 WSS_DOUBLE("Master Playback Volume", 0,
                 CMI8330_MASTVOL, CMI8330_MASTVOL, 4, 0, 15, 0),
@@ -250 +236 @@
 
 #ifdef ENABLE_SB_MIXER
-static struct sbmix_elem cmi8330_sb_mixers[] __devinitdata = {
+static const struct sbmix_elem cmi8330_sb_mixers[] = {
 SB_DOUBLE("SB Master Playback Volume", SB_DSP4_MASTER_DEV, (SB_DSP4_MASTER_DEV + 1), 3, 3, 31),
 SB_DOUBLE("Tone Control - Bass", SB_DSP4_BASS_DEV, (SB_DSP4_BASS_DEV + 1), 4, 4, 15),
@@ -268 +254 @@
 };
 
-static unsigned char cmi8330_sb_init_values[][2] __devinitdata = {
+static const unsigned char cmi8330_sb_init_values[][2] = {
         { SB_DSP4_MASTER_DEV + 0, 0 },
         { SB_DSP4_MASTER_DEV + 1, 0 },
@@ -282 +268 @@
 
 
-static int __devinit cmi8330_add_sb_mixers(struct snd_sb *chip)
+static int cmi8330_add_sb_mixers(struct snd_sb *chip)
 {
         int idx, err;
@@ -307 +293 @@
 #endif
 
-static int __devinit snd_cmi8330_mixer(struct snd_card *card, struct snd_cmi8330 *acard)
+static int snd_cmi8330_mixer(struct snd_card *card, struct snd_cmi8330 *acard)
 {
         unsigned int idx;
@@ -330 +316 @@
 
 #ifdef CONFIG_PNP
-static int __devinit snd_cmi8330_pnp(int dev, struct snd_cmi8330 *acard,
-                                     struct pnp_card_link *card,
-                                     const struct pnp_card_device_id *id)
+static int snd_cmi8330_pnp(int dev, struct snd_cmi8330 *acard,
+                           struct pnp_card_link *card,
+                           const struct pnp_card_device_id *id)
 {
         struct pnp_dev *pdev;
@@ -438 +424 @@
 }
 
-static int __devinit snd_cmi8330_pcm(struct snd_card *card, struct snd_cmi8330 *chip)
+static int snd_cmi8330_pcm(struct snd_card *card, struct snd_cmi8330 *chip)
 {
         struct snd_pcm *pcm;
         const struct snd_pcm_ops *ops;
         int err;
-        static snd_pcm_open_callback_t cmi_open_callbacks[2] = {
+        static const snd_pcm_open_callback_t cmi_open_callbacks[2] = {
                 snd_cmi8330_playback_open,
                 snd_cmi8330_capture_open
@@ -470 +456 @@
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &chip->streams[SNDRV_PCM_STREAM_CAPTURE].ops);
 
-        snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
-                                              snd_dma_isa_data(),
-                                              64*1024, 128*1024);
+        snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,
+                                       card->dev, 64*1024, 128*1024);
         chip->pcm = pcm;
 
@@ -485 +470 @@
 
         snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
-        snd_pcm_suspend_all(acard->pcm);
         acard->wss->suspend(acard->wss);
         snd_sbmixer_suspend(acard->sb);
@@ -515 +499 @@
 #define PFX     "cmi8330: "
 
-static int snd_cmi8330_card_new(int dev, struct snd_card **cardp)
+static int snd_cmi8330_card_new(struct device *pdev, int dev,
+                                struct snd_card **cardp)
 {
         struct snd_card *card;
@@ -521 +506 @@
         int err;
 
-        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
-                              sizeof(struct snd_cmi8330), &card);
+        err = snd_card_new(pdev, index[dev], id[dev], THIS_MODULE,
+                           sizeof(struct snd_cmi8330), &card);
         if (err < 0) {
                 snd_printk(KERN_ERR PFX "could not get a new card\n");
@@ -533 +518 @@
 }
 
-static int __devinit snd_cmi8330_probe(struct snd_card *card, int dev)
+static int snd_cmi8330_probe(struct snd_card *card, int dev)
 {
         struct snd_cmi8330 *acard;
@@ -598 +583 @@
                 if (snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
                                         mpuport[dev], 0, mpuirq[dev],
-                                        IRQF_DISABLED, NULL) < 0)
+                                        NULL) < 0)
                         printk(KERN_ERR PFX "no MPU-401 device at 0x%lx.\n",
                                 mpuport[dev]);
@@ -614 +599 @@
 }
 
-static int __devinit snd_cmi8330_isa_match(struct device *pdev,
-                                           unsigned int dev)
+static int snd_cmi8330_isa_match(struct device *pdev,
+                                 unsigned int dev)
 {
         if (!enable[dev] || is_isapnp_selected(dev))
@@ -630 +615 @@
 }
 
-static int __devinit snd_cmi8330_isa_probe(struct device *pdev,
-                                           unsigned int dev)
+static int snd_cmi8330_isa_probe(struct device *pdev,
+                                 unsigned int dev)
 {
         struct snd_card *card;
         int err;
 
-        err = snd_cmi8330_card_new(dev, &card);
+        err = snd_cmi8330_card_new(pdev, dev, &card);
         if (err < 0)
                 return err;
-        snd_card_set_dev(card, pdev);
         if ((err = snd_cmi8330_probe(card, dev)) < 0) {
                 snd_card_free(card);
@@ -648 +632 @@
 }
 
-static int __devexit snd_cmi8330_isa_remove(struct device *devptr,
-                                            unsigned int dev)
+static int snd_cmi8330_isa_remove(struct device *devptr,
+                                  unsigned int dev)
 {
         snd_card_free(dev_get_drvdata(devptr));
-        dev_set_drvdata(devptr, NULL);
         return 0;
 }
@@ -674 +657 @@
         .match          = snd_cmi8330_isa_match,
         .probe          = snd_cmi8330_isa_probe,
-        .remove         = __devexit_p(snd_cmi8330_isa_remove),
+        .remove         = snd_cmi8330_isa_remove,
 #ifdef CONFIG_PM
         .suspend        = snd_cmi8330_isa_suspend,
@@ -686 +669 @@
 
 #ifdef CONFIG_PNP
-static int __devinit snd_cmi8330_pnp_detect(struct pnp_card_link *pcard,
-                                            const struct pnp_card_device_id *pid)
+static int snd_cmi8330_pnp_detect(struct pnp_card_link *pcard,
+                                  const struct pnp_card_device_id *pid)
 {
         static int dev;
@@ -700 +683 @@
                 return -ENODEV;
                                
-        res = snd_cmi8330_card_new(dev, &card);
+        res = snd_cmi8330_card_new(&pcard->card->dev, dev, &card);
         if (res < 0)
                 return res;
@@ -708 +691 @@
                 return res;
         }
-        snd_card_set_dev(card, &pcard->card->dev);
         if ((res = snd_cmi8330_probe(card, dev)) < 0) {
                 snd_card_free(card);
@@ -718 +700 @@
 }
 
-static void __devexit snd_cmi8330_pnp_remove(struct pnp_card_link * pcard)
+static void snd_cmi8330_pnp_remove(struct pnp_card_link *pcard)
 {
         snd_card_free(pnp_get_card_drvdata(pcard));
@@ -741 +723 @@
         .id_table = snd_cmi8330_pnpids,
         .probe = snd_cmi8330_pnp_detect,
-        .remove = __devexit_p(snd_cmi8330_pnp_remove),
+        .remove = snd_cmi8330_pnp_remove,
 #ifdef CONFIG_PM
         .suspend        = snd_cmi8330_pnp_suspend,

GPL/trunk/alsa-kernel/isa/cs423x/cs4231.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Generic driver for CS4231 chips
@@ -4 +5 @@
  *  Originally the CS4232/CS4232A driver, modified for use on CS4231 by
  *  Tugrul Galatali <galatalt@stuy.edu>
- *
- *   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
- *
  */
 
@@ -26 +12 @@
 #include <linux/time.h>
 #include <linux/wait.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <sound/core.h>
 #include <sound/wss.h>
@@ -42 +28 @@
 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;     /* PnP setup */
 static long mpu_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* PnP setup */
@@ -56 +42 @@
 module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable " CRD_NAME " soundcard.");
-module_param_array(port, long, NULL, 0444);
+module_param_hw_array(port, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(port, "Port # for " CRD_NAME " driver.");
-module_param_array(mpu_port, long, NULL, 0444);
+module_param_hw_array(mpu_port, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(mpu_port, "MPU-401 port # for " CRD_NAME " driver.");
-module_param_array(irq, int, NULL, 0444);
+module_param_hw_array(irq, int, irq, NULL, 0444);
 MODULE_PARM_DESC(irq, "IRQ # for " CRD_NAME " driver.");
-module_param_array(mpu_irq, int, NULL, 0444);
+module_param_hw_array(mpu_irq, int, irq, NULL, 0444);
 MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for " CRD_NAME " driver.");
-module_param_array(dma1, int, NULL, 0444);
+module_param_hw_array(dma1, int, dma, NULL, 0444);
 MODULE_PARM_DESC(dma1, "DMA1 # for " CRD_NAME " driver.");
-module_param_array(dma2, int, NULL, 0444);
+module_param_hw_array(dma2, int, dma, NULL, 0444);
 MODULE_PARM_DESC(dma2, "DMA2 # for " CRD_NAME " driver.");
 
-static int __devinit snd_cs4231_match(struct device *dev, unsigned int n)
+static int snd_cs4231_match(struct device *dev, unsigned int n)
 {
         if (!enable[n])
@@ -89 +75 @@
 }
 
-static int __devinit snd_cs4231_probe(struct device *dev, unsigned int n)
+static int snd_cs4231_probe(struct device *dev, unsigned int n)
 {
         struct snd_card *card;
         struct snd_wss *chip;
-        struct snd_pcm *pcm;
         int error;
 
-        error = snd_card_create(index[n], id[n], THIS_MODULE, 0, &card);
+        error = snd_card_new(dev, index[n], id[n], THIS_MODULE, 0, &card);
         if (error < 0)
                 return error;
@@ -107 +92 @@
         card->private_data = chip;
 
-        error = snd_wss_pcm(chip, 0, &pcm);
+        error = snd_wss_pcm(chip, 0);
         if (error < 0)
                 goto out;
 
-        strcpy(card->driver, "CS4231");
-        strcpy(card->shortname, pcm->name);
+        strlcpy(card->driver, "CS4231", sizeof(card->driver));
+        strlcpy(card->shortname, chip->pcm->name, sizeof(card->shortname));
 
-        sprintf(card->longname, "%s at 0x%lx, irq %d, dma %d",
-                pcm->name, chip->port, irq[n], dma1[n]);
-        if (dma2[n] >= 0)
-                sprintf(card->longname + strlen(card->longname), "&%d", dma2[n]);
+        if (dma2[n] < 0)
+                snprintf(card->longname, sizeof(card->longname),
+                         "%s at 0x%lx, irq %d, dma %d",
+                         chip->pcm->name, chip->port, irq[n], dma1[n]);
+        else
+                snprintf(card->longname, sizeof(card->longname),
+                         "%s at 0x%lx, irq %d, dma %d&%d",
+                         chip->pcm->name, chip->port, irq[n], dma1[n], dma2[n]);
 
         error = snd_wss_mixer(chip);
@@ -123 +112 @@
                 goto out;
 
-        error = snd_wss_timer(chip, 0, NULL);
+        error = snd_wss_timer(chip, 0);
         if (error < 0)
                 goto out;
@@ -132 +121 @@
                 if (snd_mpu401_uart_new(card, 0, MPU401_HW_CS4232,
                                         mpu_port[n], 0, mpu_irq[n],
-                                        mpu_irq[n] >= 0 ? IRQF_DISABLED : 0,
                                         NULL) < 0)
                         dev_warn(dev, "MPU401 not detected\n");
         }
-
-        snd_card_set_dev(card, dev);
 
         error = snd_card_register(card);
@@ -150 +136 @@
 }
 
-static int __devexit snd_cs4231_remove(struct device *dev, unsigned int n)
+static int snd_cs4231_remove(struct device *dev, unsigned int n)
 {
         snd_card_free(dev_get_drvdata(dev));
-        dev_set_drvdata(dev, NULL);
         return 0;
 }
@@ -182 +167 @@
         .match          = snd_cs4231_match,
         .probe          = snd_cs4231_probe,
-        .remove         = __devexit_p(snd_cs4231_remove),
+        .remove         = snd_cs4231_remove,
 #ifdef CONFIG_PM
         .suspend        = snd_cs4231_suspend,
@@ -192 +177 @@
 };
 
-static int __init alsa_card_cs4231_init(void)
-{
-        return isa_register_driver(&snd_cs4231_driver, SNDRV_CARDS);
-}
-
-static void __exit alsa_card_cs4231_exit(void)
-{
-        isa_unregister_driver(&snd_cs4231_driver);
-}
-
-module_init(alsa_card_cs4231_init);
-module_exit(alsa_card_cs4231_exit);
+module_isa_driver(snd_cs4231_driver, SNDRV_CARDS);

GPL/trunk/alsa-kernel/isa/cs423x/cs4236.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Driver for generic CS4232/CS4235/CS4236/CS4236B/CS4237B/CS4238B/CS4239 chips
  *  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
- *
  */
 
@@ -24 +9 @@
 #include <linux/isa.h>
 #include <linux/pnp.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <sound/core.h>
 #include <sound/wss.h>
@@ -75 +60 @@
 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 */
-#ifdef CONFIG_PNP
-static int isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP; /* Enable this card */
+#ifdef CONFIG_PNP
+static bool isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
 #endif
 static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;     /* PnP setup */
@@ -99 +84 @@
 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 " IDENT " driver.");
-module_param_array(cport, long, NULL, 0444);
+module_param_hw_array(cport, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(cport, "Control port # for " IDENT " driver.");
-module_param_array(mpu_port, long, NULL, 0444);
+module_param_hw_array(mpu_port, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(mpu_port, "MPU-401 port # for " IDENT " driver.");
-module_param_array(fm_port, long, NULL, 0444);
+module_param_hw_array(fm_port, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(fm_port, "FM port # for " IDENT " driver.");
-module_param_array(sb_port, long, NULL, 0444);
+module_param_hw_array(sb_port, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(sb_port, "SB port # for " IDENT " driver (optional).");
-module_param_array(irq, int, NULL, 0444);
+module_param_hw_array(irq, int, irq, NULL, 0444);
 MODULE_PARM_DESC(irq, "IRQ # for " IDENT " driver.");
-module_param_array(mpu_irq, int, NULL, 0444);
+module_param_hw_array(mpu_irq, int, irq, NULL, 0444);
 MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for " IDENT " driver.");
-module_param_array(dma1, int, NULL, 0444);
+module_param_hw_array(dma1, int, dma, NULL, 0444);
 MODULE_PARM_DESC(dma1, "DMA1 # for " IDENT " driver.");
-module_param_array(dma2, int, NULL, 0444);
+module_param_hw_array(dma2, int, dma, NULL, 0444);
 MODULE_PARM_DESC(dma2, "DMA2 # for " IDENT " driver.");
 
@@ -150 +135 @@
 
 #define CS423X_ISAPNP_DRIVER    "cs4232_isapnp"
-static struct pnp_card_device_id snd_cs423x_pnpids[] = {
+static const struct pnp_card_device_id snd_cs423x_pnpids[] = {
         /* Philips PCA70PS */
         { .id = "CSC0d32", .devs = { { "CSC0000" }, { "CSC0010" }, { "PNPb006" } } },
@@ -252 +237 @@
 
 /* WSS initialization */
-static int __devinit snd_cs423x_pnp_init_wss(int dev, struct pnp_dev *pdev)
+static int snd_cs423x_pnp_init_wss(int dev, struct pnp_dev *pdev)
 {
         if (pnp_activate_dev(pdev) < 0) {
@@ -273 +258 @@
 
 /* CTRL initialization */
-static int __devinit snd_cs423x_pnp_init_ctrl(int dev, struct pnp_dev *pdev)
+static int snd_cs423x_pnp_init_ctrl(int dev, struct pnp_dev *pdev)
 {
         if (pnp_activate_dev(pdev) < 0) {
@@ -285 +270 @@
 
 /* MPU initialization */
-static int __devinit snd_cs423x_pnp_init_mpu(int dev, struct pnp_dev *pdev)
+static int snd_cs423x_pnp_init_mpu(int dev, struct pnp_dev *pdev)
 {
         if (pnp_activate_dev(pdev) < 0) {
@@ -294 +279 @@
                 mpu_port[dev] = pnp_port_start(pdev, 0);
                 if (mpu_irq[dev] >= 0 &&
-                    pnp_irq_valid(pdev, 0) && pnp_irq(pdev, 0) >= 0) {
+                    pnp_irq_valid(pdev, 0) &&
+                    pnp_irq(pdev, 0) != (resource_size_t)-1) {
                         mpu_irq[dev] = pnp_irq(pdev, 0);
                 } else {
@@ -304 +290 @@
 }
 
-static int __devinit snd_card_cs423x_pnp(int dev, struct snd_card_cs4236 *acard,
-                                         struct pnp_dev *pdev,
-                                         struct pnp_dev *cdev)
+static int snd_card_cs423x_pnp(int dev, struct snd_card_cs4236 *acard,
+                               struct pnp_dev *pdev,
+                               struct pnp_dev *cdev)
 {
         acard->wss = pdev;
@@ -318 +304 @@
 }
 
-static int __devinit snd_card_cs423x_pnpc(int dev, struct snd_card_cs4236 *acard,
-                                          struct pnp_card_link *card,
-                                          const struct pnp_card_device_id *id)
+static int snd_card_cs423x_pnpc(int dev, struct snd_card_cs4236 *acard,
+                                struct pnp_card_link *card,
+                                const struct pnp_card_device_id *id)
 {
         acard->wss = pnp_request_card_device(card, id->devs[0].id, NULL);
@@ -365 +351 @@
 }
 
-static int snd_cs423x_card_new(int dev, struct snd_card **cardp)
+static int snd_cs423x_card_new(struct device *pdev, int dev,
+                               struct snd_card **cardp)
 {
         struct snd_card *card;
         int err;
 
-        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
-                              sizeof(struct snd_card_cs4236), &card);
+        err = snd_card_new(pdev, index[dev], id[dev], THIS_MODULE,
+                           sizeof(struct snd_card_cs4236), &card);
         if (err < 0)
                 return err;
@@ -379 +366 @@
 }
 
-static int __devinit snd_cs423x_probe(struct snd_card *card, int dev)
+static int snd_cs423x_probe(struct snd_card *card, int dev)
 {
         struct snd_card_cs4236 *acard;
-        struct snd_pcm *pcm;
         struct snd_wss *chip;
         struct snd_opl3 *opl3;
@@ -404 +390 @@
         if (chip->hardware & WSS_HW_CS4236B_MASK) {
 
-                err = snd_cs4236_pcm(chip, 0, &pcm);
+                err = snd_cs4236_pcm(chip, 0);
                 if (err < 0)
                         return err;
@@ -412 +398 @@
                         return err;
         } else {
-                err = snd_wss_pcm(chip, 0, &pcm);
+                err = snd_wss_pcm(chip, 0);
                 if (err < 0)
                         return err;
@@ -420 +406 @@
                         return err;
         }
-        strcpy(card->driver, pcm->name);
-        strcpy(card->shortname, pcm->name);
-        sprintf(card->longname, "%s at 0x%lx, irq %i, dma %i",
-                pcm->name,
-                chip->port,
-                irq[dev],
-                dma1[dev]);
-        if (dma2[dev] >= 0)
-                sprintf(card->longname + strlen(card->longname), "&%d", dma2[dev]);
-
-        err = snd_wss_timer(chip, 0, NULL);
+        strlcpy(card->driver, chip->pcm->name, sizeof(card->driver));
+        strlcpy(card->shortname, chip->pcm->name, sizeof(card->shortname));
+        if (dma2[dev] < 0)
+                snprintf(card->longname, sizeof(card->longname),
+                         "%s at 0x%lx, irq %i, dma %i",
+                         chip->pcm->name, chip->port, irq[dev], dma1[dev]);
+        else
+                snprintf(card->longname, sizeof(card->longname),
+                         "%s at 0x%lx, irq %i, dma %i&%d",
+                         chip->pcm->name, chip->port, irq[dev], dma1[dev],
+                         dma2[dev]);
+
+        err = snd_wss_timer(chip, 0);
         if (err < 0)
                 return err;
@@ -450 +438 @@
                 if (snd_mpu401_uart_new(card, 0, MPU401_HW_CS4232,
                                         mpu_port[dev], 0,
-                                        mpu_irq[dev],
-                                        mpu_irq[dev] >= 0 ? IRQF_DISABLED : 0, NULL) < 0)
+                                        mpu_irq[dev], NULL) < 0)
                         printk(KERN_WARNING IDENT ": MPU401 not detected\n");
         }
@@ -458 +445 @@
 }
 
-static int __devinit snd_cs423x_isa_match(struct device *pdev,
-                                          unsigned int dev)
+static int snd_cs423x_isa_match(struct device *pdev,
+                                unsigned int dev)
 {
         if (!enable[dev] || is_isapnp_selected(dev))
@@ -483 +470 @@
 }
 
-static int __devinit snd_cs423x_isa_probe(struct device *pdev,
-                                          unsigned int dev)
+static int snd_cs423x_isa_probe(struct device *pdev,
+                                unsigned int dev)
 {
         struct snd_card *card;
         int err;
 
-        err = snd_cs423x_card_new(dev, &card);
+        err = snd_cs423x_card_new(pdev, dev, &card);
         if (err < 0)
                 return err;
-        snd_card_set_dev(card, pdev);
         if ((err = snd_cs423x_probe(card, dev)) < 0) {
                 snd_card_free(card);
@@ -502 +488 @@
 }
 
-static int __devexit snd_cs423x_isa_remove(struct device *pdev,
-                                           unsigned int dev)
+static int snd_cs423x_isa_remove(struct device *pdev,
+                                 unsigned int dev)
 {
         snd_card_free(dev_get_drvdata(pdev));
-        dev_set_drvdata(pdev, NULL);
         return 0;
 }
@@ -542 +527 @@
         .match          = snd_cs423x_isa_match,
         .probe          = snd_cs423x_isa_probe,
-        .remove         = __devexit_p(snd_cs423x_isa_remove),
+        .remove         = snd_cs423x_isa_remove,
 #ifdef CONFIG_PM
         .suspend        = snd_cs423x_isa_suspend,
@@ -554 +539 @@
 
 #ifdef CONFIG_PNP
-static int __devinit snd_cs423x_pnpbios_detect(struct pnp_dev *pdev,
-                                               const struct pnp_device_id *id)
+static int snd_cs423x_pnpbios_detect(struct pnp_dev *pdev,
+                                     const struct pnp_device_id *id)
 {
         static int dev;
@@ -580 +565 @@
                         break;
         }
-        err = snd_cs423x_card_new(dev, &card);
+        err = snd_cs423x_card_new(&pdev->dev, dev, &card);
         if (err < 0)
                 return err;
@@ -589 +574 @@
                 return err;
         }
-        snd_card_set_dev(card, &pdev->dev);
         if ((err = snd_cs423x_probe(card, dev)) < 0) {
                 snd_card_free(card);
@@ -599 +583 @@
 }
 
-static void __devexit snd_cs423x_pnp_remove(struct pnp_dev *pdev)
+static void snd_cs423x_pnp_remove(struct pnp_dev *pdev)
 {
         snd_card_free(pnp_get_drvdata(pdev));
-        pnp_set_drvdata(pdev, NULL);
 }
 
@@ -621 +604 @@
         .id_table = snd_cs423x_pnpbiosids,
         .probe = snd_cs423x_pnpbios_detect,
-        .remove = __devexit_p(snd_cs423x_pnp_remove),
+        .remove = snd_cs423x_pnp_remove,
 #ifdef CONFIG_PM
         .suspend        = snd_cs423x_pnp_suspend,
@@ -628 +611 @@
 };
 
-static int __devinit snd_cs423x_pnpc_detect(struct pnp_card_link *pcard,
-                                            const struct pnp_card_device_id *pid)
+static int snd_cs423x_pnpc_detect(struct pnp_card_link *pcard,
+                                  const struct pnp_card_device_id *pid)
 {
         static int dev;
@@ -642 +625 @@
                 return -ENODEV;
 
-        res = snd_cs423x_card_new(dev, &card);
+        res = snd_cs423x_card_new(&pcard->card->dev, dev, &card);
         if (res < 0)
                 return res;
@@ -651 +634 @@
                 return res;
         }
-        snd_card_set_dev(card, &pcard->card->dev);
         if ((res = snd_cs423x_probe(card, dev)) < 0) {
                 snd_card_free(card);
@@ -661 +643 @@
 }
 
-static void __devexit snd_cs423x_pnpc_remove(struct pnp_card_link * pcard)
+static void snd_cs423x_pnpc_remove(struct pnp_card_link *pcard)
 {
         snd_card_free(pnp_get_card_drvdata(pcard));
@@ -684 +666 @@
         .id_table = snd_cs423x_pnpids,
         .probe = snd_cs423x_pnpc_detect,
-        .remove = __devexit_p(snd_cs423x_pnpc_remove),
+        .remove = snd_cs423x_pnpc_remove,
 #ifdef CONFIG_PM
         .suspend        = snd_cs423x_pnpc_suspend,

GPL/trunk/alsa-kernel/isa/cs423x/cs4236_lib.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
@@ -8 +9 @@
  *  Bugs:
  *     -----
- *
- *   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
- *
  */
 
@@ -54 +40 @@
  *     D6: channels status block reset (CS4237B,CS4238B)
  *     D5: user bit in sub-frame of digital audio data (CS4237B,CS4238B)
- *     D4: validity bit bit in sub-frame of digital audio data (CS4237B,CS4238B)
+ *     D4: validity bit in sub-frame of digital audio data (CS4237B,CS4238B)
  * 
  *  C5  lower channel status (digital serial data description) (CS4237B,CS4238B)
@@ -80 +66 @@
  */
 
-#include <asm/io.h>
+#include <linux/io.h>
 #include <linux/delay.h>
 #include <linux/init.h>
@@ -95 +81 @@
  */
 
-static unsigned char snd_cs4236_ext_map[18] = {
+static const unsigned char snd_cs4236_ext_map[18] = {
         /* CS4236_LEFT_LINE */          0xff,
         /* CS4236_RIGHT_LINE */         0xff,
@@ -139 +125 @@
 #define CLOCKS 8
 
-static struct snd_ratnum clocks[CLOCKS] = {
+static const struct snd_ratnum clocks[CLOCKS] = {
         { .num = 16934400, .den_min = 353, .den_max = 353, .den_step = 1 },
         { .num = 16934400, .den_min = 529, .den_max = 529, .den_step = 1 },
@@ -150 +136 @@
 };
 
-static struct snd_pcm_hw_constraint_ratnums hw_constraints_clocks = {
+static const struct snd_pcm_hw_constraint_ratnums hw_constraints_clocks = {
         .nrats = CLOCKS,
         .rats = clocks,
@@ -377 +363 @@
 }
 
-int snd_cs4236_pcm(struct snd_wss *chip, int device, struct snd_pcm **rpcm)
-{
-        struct snd_pcm *pcm;
+int snd_cs4236_pcm(struct snd_wss *chip, int device)
+{
         int err;
         
-        err = snd_wss_pcm(chip, device, &pcm);
+        err = snd_wss_pcm(chip, device);
         if (err < 0)
                 return err;
-        pcm->info_flags &= ~SNDRV_PCM_INFO_JOINT_DUPLEX;
-        if (rpcm)
-                *rpcm = pcm;
+        chip->pcm->info_flags &= ~SNDRV_PCM_INFO_JOINT_DUPLEX;
         return 0;
 }
@@ -776 +759 @@
 static const DECLARE_TLV_DB_SCALE(db_scale_rec_gain, 0, 150, 0);
 
-static struct snd_kcontrol_new snd_cs4236_controls[] = {
+static const struct snd_kcontrol_new snd_cs4236_controls[] = {
 
 CS4236_DOUBLE("Master Digital Playback Switch", 0,
@@ -871 +854 @@
 static const DECLARE_TLV_DB_SCALE(db_scale_2bit_16db_max, -2400, 800, 0);
 
-static struct snd_kcontrol_new snd_cs4235_controls[] = {
+static const struct snd_kcontrol_new snd_cs4235_controls[] = {
 
 WSS_DOUBLE("Master Playback Switch", 0,
@@ -1004 +987 @@
 }
 
-static struct snd_kcontrol_new snd_cs4236_iec958_controls[] = {
+static const struct snd_kcontrol_new snd_cs4236_iec958_controls[] = {
 CS4236_IEC958_ENABLE("IEC958 Output Enable", 0),
 CS4236_SINGLEC("IEC958 Output Validity", 0, 4, 4, 1, 0),
@@ -1013 +996 @@
 };
 
-static struct snd_kcontrol_new snd_cs4236_3d_controls_cs4235[] = {
+static const struct snd_kcontrol_new snd_cs4236_3d_controls_cs4235[] = {
 CS4236_SINGLEC("3D Control - Switch", 0, 3, 4, 1, 0),
 CS4236_SINGLEC("3D Control - Space", 0, 2, 4, 15, 1)
 };
 
-static struct snd_kcontrol_new snd_cs4236_3d_controls_cs4237[] = {
+static const struct snd_kcontrol_new snd_cs4236_3d_controls_cs4237[] = {
 CS4236_SINGLEC("3D Control - Switch", 0, 3, 7, 1, 0),
 CS4236_SINGLEC("3D Control - Space", 0, 2, 4, 15, 1),
@@ -1026 +1009 @@
 };
 
-static struct snd_kcontrol_new snd_cs4236_3d_controls_cs4238[] = {
+static const struct snd_kcontrol_new snd_cs4236_3d_controls_cs4238[] = {
 CS4236_SINGLEC("3D Control - Switch", 0, 3, 4, 1, 0),
 CS4236_SINGLEC("3D Control - Space", 0, 2, 4, 15, 1),
@@ -1038 +1021 @@
         unsigned int idx, count;
         int err;
-        struct snd_kcontrol_new *kcontrol;
+        const struct snd_kcontrol_new *kcontrol;
 
         if (snd_BUG_ON(!chip || !chip->card))

GPL/trunk/alsa-kernel/isa/es1688/es1688.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Driver for generic ESS AudioDrive ESx688 soundcards
  *  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
- *
  */
 
@@ -26 +11 @@
 #include <linux/time.h>
 #include <linux/wait.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <asm/dma.h>
 #include <sound/core.h>
@@ -52 +37 @@
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;       /* ID for this card */
 #ifdef CONFIG_PNP
-static int isapnp[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP;
-#endif
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE;  /* Enable this card */
+static bool isapnp[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP;
+#endif
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE; /* Enable this card */
 static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;     /* 0x220,0x240,0x260 */
 static long fm_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;  /* Usually 0x388 */
@@ -72 +57 @@
 #endif
 MODULE_PARM_DESC(enable, "Enable " CRD_NAME " soundcard.");
-module_param_array(port, long, NULL, 0444);
+module_param_hw_array(port, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(port, "Port # for " CRD_NAME " driver.");
-module_param_array(mpu_port, long, NULL, 0444);
+module_param_hw_array(mpu_port, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(mpu_port, "MPU-401 port # for " CRD_NAME " driver.");
-module_param_array(irq, int, NULL, 0444);
-module_param_array(fm_port, long, NULL, 0444);
+module_param_hw_array(irq, int, irq, NULL, 0444);
+module_param_hw_array(fm_port, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(fm_port, "FM port # for ES1688 driver.");
 MODULE_PARM_DESC(irq, "IRQ # for " CRD_NAME " driver.");
-module_param_array(mpu_irq, int, NULL, 0444);
+module_param_hw_array(mpu_irq, int, irq, NULL, 0444);
 MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for " CRD_NAME " driver.");
-module_param_array(dma8, int, NULL, 0444);
+module_param_hw_array(dma8, int, dma, NULL, 0444);
 MODULE_PARM_DESC(dma8, "8-bit DMA # for " CRD_NAME " driver.");
 
@@ -91 +76 @@
 #endif
 
-static int __devinit snd_es1688_match(struct device *dev, unsigned int n)
+static int snd_es1688_match(struct device *dev, unsigned int n)
 {
         return enable[n] && !is_isapnp_selected(n);
 }
 
-static int __devinit snd_es1688_legacy_create(struct snd_card *card,
-                                        struct device *dev, unsigned int n)
+static int snd_es1688_legacy_create(struct snd_card *card,
+                                    struct device *dev, unsigned int n)
 {
         struct snd_es1688 *chip = card->private_data;
-        static long possible_ports[] = {0x220, 0x240, 0x260};
-        static int possible_irqs[] = {5, 9, 10, 7, -1};
-        static int possible_dmas[] = {1, 3, 0, -1};
+        static const long possible_ports[] = {0x220, 0x240, 0x260};
+        static const int possible_irqs[] = {5, 9, 10, 7, -1};
+        static const int possible_dmas[] = {1, 3, 0, -1};
 
         int i, error;
@@ -135 +120 @@
 }
 
-static int __devinit snd_es1688_probe(struct snd_card *card, unsigned int n)
+static int snd_es1688_probe(struct snd_card *card, unsigned int n)
 {
         struct snd_es1688 *chip = card->private_data;
         struct snd_opl3 *opl3;
-        struct snd_pcm *pcm;
         int error;
 
-        error = snd_es1688_pcm(card, chip, 0, &pcm);
+        error = snd_es1688_pcm(card, chip, 0);
         if (error < 0)
                 return error;
@@ -151 +135 @@
 
         strlcpy(card->driver, "ES1688", sizeof(card->driver));
-        strlcpy(card->shortname, pcm->name, sizeof(card->shortname));
+        strlcpy(card->shortname, chip->pcm->name, sizeof(card->shortname));
         snprintf(card->longname, sizeof(card->longname),
-                "%s at 0x%lx, irq %i, dma %i", pcm->name, chip->port,
+                "%s at 0x%lx, irq %i, dma %i", chip->pcm->name, chip->port,
                  chip->irq, chip->dma8);
 
@@ -175 +159 @@
                 error = snd_mpu401_uart_new(card, 0, MPU401_HW_ES1688,
                                 chip->mpu_port, 0,
-                                mpu_irq[n], IRQF_DISABLED, NULL);
+                                mpu_irq[n], NULL);
                 if (error < 0)
                         return error;
@@ -183 +167 @@
 }
 
-static int __devinit snd_es1688_isa_probe(struct device *dev, unsigned int n)
+static int snd_es1688_isa_probe(struct device *dev, unsigned int n)
 {
         struct snd_card *card;
         int error;
 
-        error = snd_card_create(index[n], id[n], THIS_MODULE,
-                                sizeof(struct snd_es1688), &card);
+        error = snd_card_new(dev, index[n], id[n], THIS_MODULE,
+                             sizeof(struct snd_es1688), &card);
         if (error < 0)
                 return error;
@@ -196 +180 @@
         if (error < 0)
                 goto out;
-
-        snd_card_set_dev(card, dev);
 
         error = snd_es1688_probe(card, n);
@@ -211 +193 @@
 }
 
-static int __devexit snd_es1688_isa_remove(struct device *dev, unsigned int n)
+static int snd_es1688_isa_remove(struct device *dev, unsigned int n)
 {
         snd_card_free(dev_get_drvdata(dev));
-        dev_set_drvdata(dev, NULL);
         return 0;
 }
@@ -221 +202 @@
         .match          = snd_es1688_match,
         .probe          = snd_es1688_isa_probe,
-        .remove         = __devexit_p(snd_es1688_isa_remove),
+        .remove         = snd_es1688_isa_remove,
 #if 0   /* FIXME */
         .suspend        = snd_es1688_suspend,
@@ -234 +215 @@
 
 #ifdef CONFIG_PNP
-static int __devinit snd_card_es968_pnp(struct snd_card *card, unsigned int n,
-                                        struct pnp_card_link *pcard,
-                                        const struct pnp_card_device_id *pid)
+static int snd_card_es968_pnp(struct snd_card *card, unsigned int n,
+                              struct pnp_card_link *pcard,
+                              const struct pnp_card_device_id *pid)
 {
         struct snd_es1688 *chip = card->private_data;
@@ -259 +240 @@
 }
 
-static int __devinit snd_es968_pnp_detect(struct pnp_card_link *pcard,
-                                          const struct pnp_card_device_id *pid)
+static int snd_es968_pnp_detect(struct pnp_card_link *pcard,
+                                const struct pnp_card_device_id *pid)
 {
         struct snd_card *card;
         static unsigned int dev;
         int error;
-        struct snd_es1688 *chip;
 
         if (snd_es968_pnp_is_probed)
@@ -276 +256 @@
                 return -ENODEV;
 
-        error = snd_card_create(index[dev], id[dev], THIS_MODULE,
-                                sizeof(struct snd_es1688), &card);
-        if (error < 0)
-                return error;
-        chip = card->private_data;
+        error = snd_card_new(&pcard->card->dev,
+                             index[dev], id[dev], THIS_MODULE,
+                             sizeof(struct snd_es1688), &card);
+        if (error < 0)
+                return error;
 
         error = snd_card_es968_pnp(card, dev, pcard, pid);
@@ -287 +267 @@
                 return error;
         }
-        snd_card_set_dev(card, &pcard->card->dev);
         error = snd_es1688_probe(card, dev);
-        if (error < 0)
-                return error;
+        if (error < 0) {
+                snd_card_free(card);
+                return error;
+        }
         pnp_set_card_drvdata(pcard, card);
         snd_es968_pnp_is_probed = 1;
@@ -296 +277 @@
 }
 
-static void __devexit snd_es968_pnp_remove(struct pnp_card_link * pcard)
+static void snd_es968_pnp_remove(struct pnp_card_link *pcard)
 {
         snd_card_free(pnp_get_card_drvdata(pcard));
@@ -308 +289 @@
 {
         struct snd_card *card = pnp_get_card_drvdata(pcard);
-        struct snd_es1688 *chip = card->private_data;
 
         snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
-        snd_pcm_suspend_all(chip->pcm);
         return 0;
 }
@@ -326 +305 @@
 #endif
 
-static struct pnp_card_device_id snd_es968_pnpids[] = {
+static const struct pnp_card_device_id snd_es968_pnpids[] = {
         { .id = "ESS0968", .devs = { { "@@@0968" }, } },
         { .id = "ESS0968", .devs = { { "ESS0968" }, } },
@@ -339 +318 @@
         .id_table       = snd_es968_pnpids,
         .probe          = snd_es968_pnp_detect,
-        .remove         = __devexit_p(snd_es968_pnp_remove),
+        .remove         = snd_es968_pnp_remove,
 #ifdef CONFIG_PM
         .suspend        = snd_es968_pnp_suspend,

GPL/trunk/alsa-kernel/isa/es1688/es1688_lib.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Routines for control of ESS ES1688/688/488 chip
- *
- *
- *   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/slab.h>
 #include <linux/ioport.h>
+#include <linux/module.h>
+#include <linux/io.h>
 #include <sound/core.h>
 #include <sound/es1688.h>
 #include <sound/initval.h>
 
-#include <asm/io.h>
 #include <asm/dma.h>
 
@@ -121 +107 @@
 {
         unsigned long flags;
-        unsigned short major, minor, hw;
+        unsigned short major, minor;
         int i;
 
@@ -166 +152 @@
                 return -ENODEV; /* probably SB */
 
-        hw = ES1688_HW_AUTO;
         switch (chip->version & 0xfff0) {
         case 0x4880:
@@ -173 +158 @@
                 return -ENODEV;
         case 0x6880:
-                hw = (chip->version & 0x0f) >= 8 ? ES1688_HW_1688 : ES1688_HW_688;
                 break;
         default:
@@ -197 +181 @@
 static int snd_es1688_init(struct snd_es1688 * chip, int enable)
 {
-        static int irqs[16] = {-1, -1, 0, -1, -1, 1, -1, 2, -1, 0, 3, -1, -1, -1, -1, -1};
+        static const int irqs[16] = {-1, -1, 0, -1, -1, 1, -1, 2, -1, 0, 3, -1, -1, -1, -1, -1};
         unsigned long flags;
         int cfg, irq_bits, dma, dma_bits, tmp, tmp1;
@@ -290 +274 @@
  */
 
-static struct snd_ratnum clocks[2] = {
+static const struct snd_ratnum clocks[2] = {
         {
                 .num = 795444,
@@ -305 +289 @@
 };
 
-static struct snd_pcm_hw_constraint_ratnums hw_constraints_clocks  = {
+static const struct snd_pcm_hw_constraint_ratnums hw_constraints_clocks  = {
         .nrats = 2,
         .rats = clocks,
@@ -326 +310 @@
 }
 
-static int snd_es1688_ioctl(struct snd_pcm_substream *substream,
-                            unsigned int cmd, void *arg)
-{
-        return snd_pcm_lib_ioctl(substream, cmd, arg);
-}
-
 static int snd_es1688_trigger(struct snd_es1688 *chip, int cmd, unsigned char value)
 {
@@ -356 +334 @@
         spin_unlock(&chip->reg_lock);
         return 0;
-}
-
-static int snd_es1688_hw_params(struct snd_pcm_substream *substream,
-                                struct snd_pcm_hw_params *hw_params)
-{
-        return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
-}
-
-static int snd_es1688_hw_free(struct snd_pcm_substream *substream)
-{
-        return snd_pcm_lib_free_pages(substream);
 }
 
@@ -526 +493 @@
  */
 
-static struct snd_pcm_hardware snd_es1688_playback =
+static const struct snd_pcm_hardware snd_es1688_playback =
 {
         .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
@@ -544 +511 @@
 };
 
-static struct snd_pcm_hardware snd_es1688_capture =
+static const struct snd_pcm_hardware snd_es1688_capture =
 {
         .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
@@ -612 +579 @@
 static int snd_es1688_free(struct snd_es1688 *chip)
 {
-        if (chip->res_port) {
+        if (chip->hardware != ES1688_HW_UNDEF)
                 snd_es1688_init(chip, 0);
-                release_and_free_resource(chip->res_port);
-        }
+        release_and_free_resource(chip->res_port);
         if (chip->irq >= 0)
                 free_irq(chip->irq, (void *) chip);
@@ -647 +613 @@
                       unsigned short hardware)
 {
-        static struct snd_device_ops ops = {
+        static const struct snd_device_ops ops = {
                 .dev_free =     snd_es1688_dev_free,
         };
@@ -657 +623 @@
         chip->irq = -1;
         chip->dma8 = -1;
+        chip->hardware = ES1688_HW_UNDEF;
         
-        if ((chip->res_port = request_region(port + 4, 12, "ES1688")) == NULL) {
+        chip->res_port = request_region(port + 4, 12, "ES1688");
+        if (chip->res_port == NULL) {
                 snd_printk(KERN_ERR "es1688: can't grab port 0x%lx\n", port + 4);
-                return -EBUSY;
-        }
-        if (request_irq(irq, snd_es1688_interrupt, IRQF_DISABLED, "ES1688", (void *) chip)) {
+                err = -EBUSY;
+                goto exit;
+        }
+
+        err = request_irq(irq, snd_es1688_interrupt, 0, "ES1688", (void *) chip);
+        if (err < 0) {
                 snd_printk(KERN_ERR "es1688: can't grab IRQ %d\n", irq);
-                return -EBUSY;
-        }
+                goto exit;
+        }
+
         chip->irq = irq;
-        if (request_dma(dma8, "ES1688")) {
+        card->sync_irq = chip->irq;
+        err = request_dma(dma8, "ES1688");
+
+        if (err < 0) {
                 snd_printk(KERN_ERR "es1688: can't grab DMA8 %d\n", dma8);
-                return -EBUSY;
+                goto exit;
         }
         chip->dma8 = dma8;
@@ -685 +660 @@
         err = snd_es1688_probe(chip);
         if (err < 0)
-                return err;
+                goto exit;
 
         err = snd_es1688_init(chip, 1);
         if (err < 0)
-                return err;
+                goto exit;
 
         /* Register device */
-        return snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
-}
-
-static struct snd_pcm_ops snd_es1688_playback_ops = {
+        err = snd_device_new(card, SNDRV_DEV_LOWLEVEL, chip, &ops);
+exit:
+        if (err)
+                snd_es1688_free(chip);
+        return err;
+}
+
+static const struct snd_pcm_ops snd_es1688_playback_ops = {
         .open =                 snd_es1688_playback_open,
         .close =                snd_es1688_playback_close,
-        .ioctl =                snd_es1688_ioctl,
-        .hw_params =            snd_es1688_hw_params,
-        .hw_free =              snd_es1688_hw_free,
         .prepare =              snd_es1688_playback_prepare,
         .trigger =              snd_es1688_playback_trigger,
@@ -706 +682 @@
 };
 
-static struct snd_pcm_ops snd_es1688_capture_ops = {
+static const struct snd_pcm_ops snd_es1688_capture_ops = {
         .open =                 snd_es1688_capture_open,
         .close =                snd_es1688_capture_close,
-        .ioctl =                snd_es1688_ioctl,
-        .hw_params =            snd_es1688_hw_params,
-        .hw_free =              snd_es1688_hw_free,
         .prepare =              snd_es1688_capture_prepare,
         .trigger =              snd_es1688_capture_trigger,
@@ -717 +690 @@
 };
 
-int snd_es1688_pcm(struct snd_card *card, struct snd_es1688 *chip,
-                   int device, struct snd_pcm **rpcm)
+int snd_es1688_pcm(struct snd_card *card, struct snd_es1688 *chip, int device)
 {
         struct snd_pcm *pcm;
@@ -732 +704 @@
         pcm->private_data = chip;
         pcm->info_flags = SNDRV_PCM_INFO_HALF_DUPLEX;
-        sprintf(pcm->name, snd_es1688_chip_id(chip));
+        strcpy(pcm->name, snd_es1688_chip_id(chip));
         chip->pcm = pcm;
 
-        snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
-                                              snd_dma_isa_data(),
-                                              64*1024, 64*1024);
-
-        if (rpcm)
-                *rpcm = pcm;
+        snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV, card->dev,
+                                       64*1024, 64*1024);
         return 0;
 }
@@ -750 +718 @@
 static int snd_es1688_info_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
-        static char *texts[9] = {
+        static const char * const texts[8] = {
                 "Mic", "Mic Master", "CD", "AOUT",
                 "Mic1", "Mix", "Line", "Master"
         };
 
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        uinfo->count = 1;
-        uinfo->value.enumerated.items = 8;
-        if (uinfo->value.enumerated.item > 7)
-                uinfo->value.enumerated.item = 7;
-        strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
-        return 0;
+        return snd_ctl_enum_info(uinfo, 1, 8, texts);
 }
 
@@ -963 +925 @@
 }
 
-static struct snd_kcontrol_new snd_es1688_controls[] = {
+static const struct snd_kcontrol_new snd_es1688_controls[] = {
 ES1688_DOUBLE("Master Playback Volume", 0, ES1688_MASTER_DEV, ES1688_MASTER_DEV, 4, 0, 15, 0),
 ES1688_DOUBLE("PCM Playback Volume", 0, ES1688_PCM_DEV, ES1688_PCM_DEV, 4, 0, 15, 0),
@@ -985 +947 @@
 #define ES1688_INIT_TABLE_SIZE (sizeof(snd_es1688_init_table)/2)
 
-static unsigned char snd_es1688_init_table[][2] = {
+static const unsigned char snd_es1688_init_table[][2] = {
         { ES1688_MASTER_DEV, 0 },
         { ES1688_PCM_DEV, 0 },
@@ -1028 +990 @@
 EXPORT_SYMBOL(snd_es1688_pcm);
 EXPORT_SYMBOL(snd_es1688_mixer);
-
-/*
- *  INIT part
- */
-
-static int __init alsa_es1688_init(void)
-{
-        return 0;
-}
-
-static void __exit alsa_es1688_exit(void)
-{
-}
-
-module_init(alsa_es1688_init)
-module_exit(alsa_es1688_exit)

GPL/trunk/alsa-kernel/isa/es18xx.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Driver for generic ESS AudioDrive ES18xx soundcards
  *  Copyright (c) by Christian Fischbach <fishbach@pool.informatik.rwth-aachen.de>
  *  Copyright (c) by Abramo Bagnara <abramo@alsa-project.org>
- *
- *
- *   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
- *
  */
 /* GENERAL NOTES:
@@ -83 +68 @@
 #include <linux/pnp.h>
 #include <linux/isapnp.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <linux/delay.h>
-
-#include <asm/io.h>
+#include <linux/io.h>
+
 #include <asm/dma.h>
 #include <sound/core.h>
@@ -157 +142 @@
 #define ES18XX_MUTEREC  0x0400  /* Record source can be muted */
 #define ES18XX_CONTROL  0x0800  /* Has control ports */
+#define ES18XX_GPO_2BIT 0x1000  /* GPO0,1 controlled by PM port */
 
 /* Power Management */
@@ -349 +335 @@
 
 
-static int __devinit snd_es18xx_reset(struct snd_es18xx *chip)
+static int snd_es18xx_reset(struct snd_es18xx *chip)
 {
         int i;
@@ -369 +355 @@
 }
 
-static struct snd_ratnum new_clocks[2] = {
+static const struct snd_ratnum new_clocks[2] = {
         {
                 .num = 793800,
@@ -384 +370 @@
 };
 
-static struct snd_pcm_hw_constraint_ratnums new_hw_constraints_clocks = {
+static const struct snd_pcm_hw_constraint_ratnums new_hw_constraints_clocks = {
         .nrats = 2,
         .rats = new_clocks,
 };
 
-static struct snd_ratnum old_clocks[2] = {
+static const struct snd_ratnum old_clocks[2] = {
         {
                 .num = 795444,
@@ -404 +390 @@
 };
 
-static struct snd_pcm_hw_constraint_ratnums old_hw_constraints_clocks  = {
+static const struct snd_pcm_hw_constraint_ratnums old_hw_constraints_clocks  = {
         .nrats = 2,
         .rats = old_clocks,
@@ -449 +435 @@
 {
         struct snd_es18xx *chip = snd_pcm_substream_chip(substream);
-        int shift, err;
+        int shift;
 
         shift = 0;
@@ -468 +454 @@
                 chip->dma1_shift = shift;
         }
-        if ((err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params))) < 0)
-                return err;
-        return 0;
-}
-
-static int snd_es18xx_pcm_hw_free(struct snd_pcm_substream *substream)
-{
-        return snd_pcm_lib_free_pages(substream);
+        return 0;
 }
 
@@ -521 +500 @@
 #ifdef AVOID_POPS
                 /* Avoid pops */
-                udelay(100000);
+                mdelay(100);
                 if (chip->caps & ES18XX_PCM2)
                         /* Restore Audio 2 volume */
@@ -538 +517 @@
                 snd_es18xx_mixer_write(chip, 0x78, 0x00);
 #ifdef AVOID_POPS
-                udelay(25000);
+                mdelay(25);
                 if (chip->caps & ES18XX_PCM2)
                         /* Set Audio 2 volume to 0 */
@@ -558 +537 @@
 {
         struct snd_es18xx *chip = snd_pcm_substream_chip(substream);
-        int shift, err;
+        int shift;
 
         shift = 0;
@@ -572 +551 @@
                 shift++;
         chip->dma1_shift = shift;
-        if ((err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params))) < 0)
-                return err;
         return 0;
 }
@@ -597 +574 @@
 
 #ifdef AVOID_POPS
-        udelay(100000);
+        mdelay(100);
 #endif
 
@@ -692 +669 @@
 #ifdef AVOID_POPS
                 /* Avoid pops */
-                udelay(100000);
+                mdelay(100);
                 /* Enable Audio 1 */
                 snd_es18xx_dsp_command(chip, 0xD1);
@@ -706 +683 @@
 #ifdef AVOID_POPS
                 /* Avoid pops */
-                udelay(25000);
+                mdelay(25);
                 /* Disable Audio 1 */
                 snd_es18xx_dsp_command(chip, 0xD3);
@@ -838 +815 @@
 }
 
-static struct snd_pcm_hardware snd_es18xx_playback =
+static const struct snd_pcm_hardware snd_es18xx_playback =
 {
         .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
@@ -858 +835 @@
 };
 
-static struct snd_pcm_hardware snd_es18xx_capture =
+static const struct snd_pcm_hardware snd_es18xx_capture =
 {
         .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
@@ -930 +907 @@
                 chip->playback_b_substream = NULL;
         
-        snd_pcm_lib_free_pages(substream);
         return 0;
 }
@@ -939 +915 @@
 
         chip->capture_a_substream = NULL;
-        snd_pcm_lib_free_pages(substream);
         return 0;
 }
@@ -965 +940 @@
 static int snd_es18xx_info_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
-        static char *texts5Source[5] = {
+        static const char * const texts5Source[5] = {
                 "Mic", "CD", "Line", "Master", "Mix"
         };
-        static char *texts8Source[8] = {
+        static const char * const texts8Source[8] = {
                 "Mic", "Mic Master", "CD", "AOUT",
                 "Mic1", "Mix", "Line", "Master"
@@ -974 +949 @@
         struct snd_es18xx *chip = snd_kcontrol_chip(kcontrol);
 
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        uinfo->count = 1;
         switch (chip->version) {
         case 0x1868:
         case 0x1878:
-                uinfo->value.enumerated.items = 4;
-                if (uinfo->value.enumerated.item > 3)
-                        uinfo->value.enumerated.item = 3;
-                strcpy(uinfo->value.enumerated.name,
-                        texts5Source[uinfo->value.enumerated.item]);
-                break;
+                return snd_ctl_enum_info(uinfo, 1, 4, texts5Source);
         case 0x1887:
         case 0x1888:
-                uinfo->value.enumerated.items = 5;
-                if (uinfo->value.enumerated.item > 4)
-                        uinfo->value.enumerated.item = 4;
-                strcpy(uinfo->value.enumerated.name, texts5Source[uinfo->value.enumerated.item]);
-                break;
-        case 0x1869: /* DS somewhat contradictory for 1869: could be be 5 or 8 */
+                return snd_ctl_enum_info(uinfo, 1, 5, texts5Source);
+        case 0x1869: /* DS somewhat contradictory for 1869: could be 5 or 8 */
         case 0x1879:
-                uinfo->value.enumerated.items = 8;
-                if (uinfo->value.enumerated.item > 7)
-                        uinfo->value.enumerated.item = 7;
-                strcpy(uinfo->value.enumerated.name, texts8Source[uinfo->value.enumerated.item]);
-                break;
+                return snd_ctl_enum_info(uinfo, 1, 8, texts8Source);
         default:
                 return -EINVAL;
         }
-        return 0;
 }
 
 static int snd_es18xx_get_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-        static unsigned char invMap4Source[8] = {0, 0, 1, 1, 0, 0, 2, 3};
+        static const unsigned char invMap4Source[8] = {0, 0, 1, 1, 0, 0, 2, 3};
         struct snd_es18xx *chip = snd_kcontrol_chip(kcontrol);
         int muxSource = snd_es18xx_mixer_read(chip, 0x1c) & 0x07;
@@ -1024 +983 @@
 static int snd_es18xx_put_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_value *ucontrol)
 {
-        static unsigned char map4Source[4] = {0, 2, 6, 7};
+        static const unsigned char map4Source[4] = {0, 2, 6, 7};
         struct snd_es18xx *chip = snd_kcontrol_chip(kcontrol);
         unsigned char val = ucontrol->value.enumerated.item[0];
@@ -1040 +999 @@
                 } else
                         retVal = snd_es18xx_mixer_bits(chip, 0x7a, 0x08, 0x00) != 0x00;
+                fallthrough;
  /* 4 source chips */
         case 0x1868:
@@ -1137 +1097 @@
 }
 
-#define ES18XX_SINGLE(xname, xindex, reg, shift, mask, invert) \
+#define ES18XX_SINGLE(xname, xindex, reg, shift, mask, flags) \
 { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, .index = xindex, \
   .info = snd_es18xx_info_single, \
   .get = snd_es18xx_get_single, .put = snd_es18xx_put_single, \
-  .private_value = reg | (shift << 8) | (mask << 16) | (invert << 24) }
+  .private_value = reg | (shift << 8) | (mask << 16) | (flags << 24) }
+
+#define ES18XX_FL_INVERT        (1 << 0)
+#define ES18XX_FL_PMPORT        (1 << 1)
 
 static int snd_es18xx_info_single(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
@@ -1160 +1123 @@
         int shift = (kcontrol->private_value >> 8) & 0xff;
         int mask = (kcontrol->private_value >> 16) & 0xff;
-        int invert = (kcontrol->private_value >> 24) & 0xff;
+        int invert = (kcontrol->private_value >> 24) & ES18XX_FL_INVERT;
+        int pm_port = (kcontrol->private_value >> 24) & ES18XX_FL_PMPORT;
         int val;
-        
-        val = snd_es18xx_reg_read(chip, reg);
+
+        if (pm_port)
+                val = inb(chip->port + ES18XX_PM);
+        else
+                val = snd_es18xx_reg_read(chip, reg);
         ucontrol->value.integer.value[0] = (val >> shift) & mask;
         if (invert)
@@ -1176 +1143 @@
         int shift = (kcontrol->private_value >> 8) & 0xff;
         int mask = (kcontrol->private_value >> 16) & 0xff;
-        int invert = (kcontrol->private_value >> 24) & 0xff;
+        int invert = (kcontrol->private_value >> 24) & ES18XX_FL_INVERT;
+        int pm_port = (kcontrol->private_value >> 24) & ES18XX_FL_PMPORT;
         unsigned char val;
         
@@ -1184 +1152 @@
         mask <<= shift;
         val <<= shift;
+        if (pm_port) {
+                unsigned char cur = inb(chip->port + ES18XX_PM);
+
+                if ((cur & mask) == val)
+                        return 0;
+                outb((cur & ~mask) | val, chip->port + ES18XX_PM);
+                return 1;
+        }
+
         return snd_es18xx_reg_bits(chip, reg, mask, val) != val;
 }
@@ -1270 +1247 @@
  * here.
  */
-static struct snd_kcontrol_new snd_es18xx_base_controls[] = {
+static const struct snd_kcontrol_new snd_es18xx_base_controls[] = {
 ES18XX_DOUBLE("Master Playback Volume", 0, 0x60, 0x62, 0, 0, 63, 0),
 ES18XX_DOUBLE("Master Playback Switch", 0, 0x60, 0x62, 6, 6, 1, 1),
@@ -1289 +1266 @@
 };
 
-static struct snd_kcontrol_new snd_es18xx_recmix_controls[] = {
+static const struct snd_kcontrol_new snd_es18xx_recmix_controls[] = {
 ES18XX_DOUBLE("PCM Capture Volume", 0, 0x69, 0x69, 4, 0, 15, 0),
 ES18XX_DOUBLE("Mic Capture Volume", 0, 0x68, 0x68, 4, 0, 15, 0),
@@ -1301 +1278 @@
  * The chipset specific mixer controls
  */
-static struct snd_kcontrol_new snd_es18xx_opt_speaker =
+static const struct snd_kcontrol_new snd_es18xx_opt_speaker =
         ES18XX_SINGLE("Beep Playback Volume", 0, 0x3c, 0, 7, 0);
 
-static struct snd_kcontrol_new snd_es18xx_opt_1869[] = {
-ES18XX_SINGLE("Capture Switch", 0, 0x1c, 4, 1, 1),
+static const struct snd_kcontrol_new snd_es18xx_opt_1869[] = {
+ES18XX_SINGLE("Capture Switch", 0, 0x1c, 4, 1, ES18XX_FL_INVERT),
 ES18XX_SINGLE("Video Playback Switch", 0, 0x7f, 0, 1, 0),
 ES18XX_DOUBLE("Mono Playback Volume", 0, 0x6d, 0x6d, 4, 0, 15, 0),
@@ -1311 +1288 @@
 };
 
-static struct snd_kcontrol_new snd_es18xx_opt_1878 =
+static const struct snd_kcontrol_new snd_es18xx_opt_1878 =
         ES18XX_DOUBLE("Video Playback Volume", 0, 0x68, 0x68, 4, 0, 15, 0);
 
-static struct snd_kcontrol_new snd_es18xx_opt_1879[] = {
+static const struct snd_kcontrol_new snd_es18xx_opt_1879[] = {
 ES18XX_SINGLE("Video Playback Switch", 0, 0x71, 6, 1, 0),
 ES18XX_DOUBLE("Video Playback Volume", 0, 0x6d, 0x6d, 4, 0, 15, 0),
@@ -1320 +1297 @@
 };
 
-static struct snd_kcontrol_new snd_es18xx_pcm1_controls[] = {
+static const struct snd_kcontrol_new snd_es18xx_pcm1_controls[] = {
 ES18XX_DOUBLE("PCM Playback Volume", 0, 0x14, 0x14, 4, 0, 15, 0),
 };
 
-static struct snd_kcontrol_new snd_es18xx_pcm2_controls[] = {
+static const struct snd_kcontrol_new snd_es18xx_pcm2_controls[] = {
 ES18XX_DOUBLE("PCM Playback Volume", 0, 0x7c, 0x7c, 4, 0, 15, 0),
 ES18XX_DOUBLE("PCM Playback Volume", 1, 0x14, 0x14, 4, 0, 15, 0)
 };
 
-static struct snd_kcontrol_new snd_es18xx_spatializer_controls[] = {
+static const struct snd_kcontrol_new snd_es18xx_spatializer_controls[] = {
 ES18XX_SINGLE("3D Control - Level", 0, 0x52, 0, 63, 0),
 {
@@ -1340 +1317 @@
 };
 
-static struct snd_kcontrol_new snd_es18xx_micpre1_control = 
+static const struct snd_kcontrol_new snd_es18xx_micpre1_control =
 ES18XX_SINGLE("Mic Boost (+26dB)", 0, 0xa9, 2, 1, 0);
 
-static struct snd_kcontrol_new snd_es18xx_micpre2_control =
+static const struct snd_kcontrol_new snd_es18xx_micpre2_control =
 ES18XX_SINGLE("Mic Boost (+26dB)", 0, 0x7d, 3, 1, 0);
 
-static struct snd_kcontrol_new snd_es18xx_hw_volume_controls[] = {
+static const struct snd_kcontrol_new snd_es18xx_hw_volume_controls[] = {
 {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -1364 +1341 @@
 };
 
-static int __devinit snd_es18xx_config_read(struct snd_es18xx *chip, unsigned char reg)
+static const struct snd_kcontrol_new snd_es18xx_opt_gpo_2bit[] = {
+ES18XX_SINGLE("GPO0 Switch", 0, ES18XX_PM, 0, 1, ES18XX_FL_PMPORT),
+ES18XX_SINGLE("GPO1 Switch", 0, ES18XX_PM, 1, 1, ES18XX_FL_PMPORT),
+};
+
+static int snd_es18xx_config_read(struct snd_es18xx *chip, unsigned char reg)
 {
         int data;
@@ -1373 +1355 @@
 }
 
-static void __devinit snd_es18xx_config_write(struct snd_es18xx *chip, 
-                                              unsigned char reg, unsigned char data)
+static void snd_es18xx_config_write(struct snd_es18xx *chip,
+                                    unsigned char reg, unsigned char data)
 {
         /* No need for spinlocks, this function is used only in
@@ -1385 +1367 @@
 }
 
-static int __devinit snd_es18xx_initialize(struct snd_es18xx *chip,
-                                           unsigned long mpu_port,
-                                           unsigned long fm_port)
+static int snd_es18xx_initialize(struct snd_es18xx *chip,
+                                 unsigned long mpu_port,
+                                 unsigned long fm_port)
 {
         int mask = 0;
@@ -1550 +1532 @@
 }
 
-static int __devinit snd_es18xx_identify(struct snd_es18xx *chip)
+static int snd_es18xx_identify(struct snd_es18xx *chip)
 {
         int hi,lo;
@@ -1619 +1601 @@
 }
 
-static int __devinit snd_es18xx_probe(struct snd_es18xx *chip,
-                                        unsigned long mpu_port,
-                                        unsigned long fm_port)
+static int snd_es18xx_probe(struct snd_es18xx *chip,
+                            unsigned long mpu_port,
+                            unsigned long fm_port)
 {
         if (snd_es18xx_identify(chip) < 0) {
@@ -1630 +1612 @@
         switch (chip->version) {
         case 0x1868:
-                chip->caps = ES18XX_DUPLEX_MONO | ES18XX_DUPLEX_SAME | ES18XX_CONTROL;
+                chip->caps = ES18XX_DUPLEX_MONO | ES18XX_DUPLEX_SAME | ES18XX_CONTROL | ES18XX_GPO_2BIT;
                 break;
         case 0x1869:
-                chip->caps = ES18XX_PCM2 | ES18XX_SPATIALIZER | ES18XX_RECMIX | ES18XX_NEW_RATE | ES18XX_AUXB | ES18XX_MONO | ES18XX_MUTEREC | ES18XX_CONTROL | ES18XX_HWV;
+                chip->caps = ES18XX_PCM2 | ES18XX_SPATIALIZER | ES18XX_RECMIX | ES18XX_NEW_RATE | ES18XX_AUXB | ES18XX_MONO | ES18XX_MUTEREC | ES18XX_CONTROL | ES18XX_HWV | ES18XX_GPO_2BIT;
                 break;
         case 0x1878:
@@ -1643 +1625 @@
         case 0x1887:
         case 0x1888:
-                chip->caps = ES18XX_PCM2 | ES18XX_RECMIX | ES18XX_AUXB | ES18XX_DUPLEX_SAME;
+                chip->caps = ES18XX_PCM2 | ES18XX_RECMIX | ES18XX_AUXB | ES18XX_DUPLEX_SAME | ES18XX_GPO_2BIT;
                 break;
         default:
@@ -1659 +1641 @@
 }
 
-static struct snd_pcm_ops snd_es18xx_playback_ops = {
+static const struct snd_pcm_ops snd_es18xx_playback_ops = {
         .open =         snd_es18xx_playback_open,
         .close =        snd_es18xx_playback_close,
-        .ioctl =        snd_pcm_lib_ioctl,
         .hw_params =    snd_es18xx_playback_hw_params,
-        .hw_free =      snd_es18xx_pcm_hw_free,
         .prepare =      snd_es18xx_playback_prepare,
         .trigger =      snd_es18xx_playback_trigger,
@@ -1670 +1650 @@
 };
 
-static struct snd_pcm_ops snd_es18xx_capture_ops = {
+static const struct snd_pcm_ops snd_es18xx_capture_ops = {
         .open =         snd_es18xx_capture_open,
         .close =        snd_es18xx_capture_close,
-        .ioctl =        snd_pcm_lib_ioctl,
         .hw_params =    snd_es18xx_capture_hw_params,
-        .hw_free =      snd_es18xx_pcm_hw_free,
         .prepare =      snd_es18xx_capture_prepare,
         .trigger =      snd_es18xx_capture_trigger,
@@ -1681 +1659 @@
 };
 
-static int __devinit snd_es18xx_pcm(struct snd_card *card, int device,
-                                    struct snd_pcm **rpcm)
+static int snd_es18xx_pcm(struct snd_card *card, int device)
 {
         struct snd_es18xx *chip = card->private_data;
@@ -1689 +1666 @@
         int err;
 
-        if (rpcm)
-                *rpcm = NULL;
         sprintf(str, "ES%x", chip->version);
         if (chip->caps & ES18XX_PCM2)
@@ -1712 +1687 @@
         chip->pcm = pcm;
 
-        snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
-                                              snd_dma_isa_data(),
-                                              64*1024,
-                                              chip->dma1 > 3 || chip->dma2 > 3 ? 128*1024 : 64*1024);
-
-        if (rpcm)
-                *rpcm = pcm;
+        snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV, card->dev,
+                                       64*1024,
+                                       chip->dma1 > 3 || chip->dma2 > 3 ? 128*1024 : 64*1024);
         return 0;
 }
@@ -1729 +1700 @@
 
         snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
-
-        snd_pcm_suspend_all(chip->pcm);
 
         /* power down */
@@ -1778 +1747 @@
 }
 
-static int __devinit snd_es18xx_new_device(struct snd_card *card,
-                                           unsigned long port,
-                                           unsigned long mpu_port,
-                                           unsigned long fm_port,
-                                           int irq, int dma1, int dma2)
+static int snd_es18xx_new_device(struct snd_card *card,
+                                 unsigned long port,
+                                 unsigned long mpu_port,
+                                 unsigned long fm_port,
+                                 int irq, int dma1, int dma2)
 {
         struct snd_es18xx *chip = card->private_data;
-        static struct snd_device_ops ops = {
+        static const struct snd_device_ops ops = {
                 .dev_free =     snd_es18xx_dev_free,
         };
@@ -1806 +1775 @@
         }
 
-        if (request_irq(irq, snd_es18xx_interrupt, IRQF_DISABLED, "ES18xx",
+        if (request_irq(irq, snd_es18xx_interrupt, 0, "ES18xx",
                         (void *) card)) {
                 snd_es18xx_free(card);
@@ -1813 +1782 @@
         }
         chip->irq = irq;
+        card->sync_irq = chip->irq;
 
         if (request_dma(dma1, "ES18xx DMA 1")) {
@@ -1840 +1810 @@
 }
 
-static int __devinit snd_es18xx_mixer(struct snd_card *card)
+static int snd_es18xx_mixer(struct snd_card *card)
 {
         struct snd_es18xx *chip = card->private_data;
@@ -1945 +1915 @@
                 }
         }
+        if (chip->caps & ES18XX_GPO_2BIT) {
+                for (idx = 0; idx < ARRAY_SIZE(snd_es18xx_opt_gpo_2bit); idx++) {
+                        err = snd_ctl_add(card,
+                                          snd_ctl_new1(&snd_es18xx_opt_gpo_2bit[idx],
+                                                       chip));
+                        if (err < 0)
+                                return err;
+                }
+        }
         return 0;
 }
@@ -1965 +1944 @@
 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] = SNDRV_DEFAULT_ENABLE_ISAPNP;
+static bool isapnp[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP;
 #endif
 static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;     /* 0x220,0x240,0x260,0x280 */
@@ -1990 +1969 @@
 MODULE_PARM_DESC(isapnp, "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 ES18xx driver.");
-module_param_array(mpu_port, long, NULL, 0444);
+module_param_hw_array(mpu_port, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(mpu_port, "MPU-401 port # for ES18xx driver.");
-module_param_array(fm_port, long, NULL, 0444);
+module_param_hw_array(fm_port, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(fm_port, "FM port # for ES18xx driver.");
-module_param_array(irq, int, NULL, 0444);
+module_param_hw_array(irq, int, irq, NULL, 0444);
 MODULE_PARM_DESC(irq, "IRQ # for ES18xx driver.");
-module_param_array(dma1, int, NULL, 0444);
+module_param_hw_array(dma1, int, dma, NULL, 0444);
 MODULE_PARM_DESC(dma1, "DMA 1 # for ES18xx driver.");
-module_param_array(dma2, int, NULL, 0444);
+module_param_hw_array(dma2, int, dma, NULL, 0444);
 MODULE_PARM_DESC(dma2, "DMA 2 # for ES18xx driver.");
 
@@ -2008 +1987 @@
 static int pnpc_registered;
 
-static struct pnp_device_id snd_audiodrive_pnpbiosids[] = {
+static const struct pnp_device_id snd_audiodrive_pnpbiosids[] = {
         { .id = "ESS1869" },
         { .id = "ESS1879" },
@@ -2017 +1996 @@
 
 /* PnP main device initialization */
-static int __devinit snd_audiodrive_pnp_init_main(int dev, struct pnp_dev *pdev)
+static int snd_audiodrive_pnp_init_main(int dev, struct pnp_dev *pdev)
 {
         if (pnp_activate_dev(pdev) < 0) {
@@ -2044 +2023 @@
 }
 
-static int __devinit snd_audiodrive_pnp(int dev, struct snd_es18xx *chip,
-                                        struct pnp_dev *pdev)
+static int snd_audiodrive_pnp(int dev, struct snd_es18xx *chip,
+                              struct pnp_dev *pdev)
 {
         chip->dev = pdev;
@@ -2053 +2032 @@
 }
 
-static struct pnp_card_device_id snd_audiodrive_pnpids[] = {
+static const struct pnp_card_device_id snd_audiodrive_pnpids[] = {
         /* ESS 1868 (integrated on Compaq dual P-Pro motherboard and Genius 18PnP 3D) */
         { .id = "ESS1868", .devs = { { "ESS1868" }, { "ESS0000" } } },
@@ -2074 +2053 @@
 MODULE_DEVICE_TABLE(pnp_card, snd_audiodrive_pnpids);
 
-static int __devinit snd_audiodrive_pnpc(int dev, struct snd_es18xx *chip,
-                                        struct pnp_card_link *card,
-                                        const struct pnp_card_device_id *id)
+static int snd_audiodrive_pnpc(int dev, struct snd_es18xx *chip,
+                               struct pnp_card_link *card,
+                               const struct pnp_card_device_id *id)
 {
         chip->dev = pnp_request_card_device(card, id->devs[0].id, NULL);
@@ -2106 +2085 @@
 #endif
 
-static int snd_es18xx_card_new(int dev, struct snd_card **cardp)
-{
-        return snd_card_create(index[dev], id[dev], THIS_MODULE,
-                               sizeof(struct snd_es18xx), cardp);
-}
-
-static int __devinit snd_audiodrive_probe(struct snd_card *card, int dev)
+static int snd_es18xx_card_new(struct device *pdev, int dev,
+                               struct snd_card **cardp)
+{
+        return snd_card_new(pdev, index[dev], id[dev], THIS_MODULE,
+                            sizeof(struct snd_es18xx), cardp);
+}
+
+static int snd_audiodrive_probe(struct snd_card *card, int dev)
 {
         struct snd_es18xx *chip = card->private_data;
@@ -2138 +2118 @@
                         irq[dev], dma1[dev]);
 
-        err = snd_es18xx_pcm(card, 0, NULL);
+        err = snd_es18xx_pcm(card, 0);
         if (err < 0)
                 return err;
@@ -2161 +2141 @@
         if (mpu_port[dev] > 0 && mpu_port[dev] != SNDRV_AUTO_PORT) {
                 err = snd_mpu401_uart_new(card, 0, MPU401_HW_ES18XX,
-                                          mpu_port[dev], 0,
-                                          irq[dev], 0, &chip->rmidi);
+                                          mpu_port[dev], MPU401_INFO_IRQ_HOOK,
+                                          -1, &chip->rmidi);
                 if (err < 0)
                         return err;
@@ -2170 +2150 @@
 }
 
-static int __devinit snd_es18xx_isa_match(struct device *pdev, unsigned int dev)
+static int snd_es18xx_isa_match(struct device *pdev, unsigned int dev)
 {
         return enable[dev] && !is_isapnp_selected(dev);
 }
 
-static int __devinit snd_es18xx_isa_probe1(int dev, struct device *devptr)
+static int snd_es18xx_isa_probe1(int dev, struct device *devptr)
 {
         struct snd_card *card;
         int err;
 
-        err = snd_es18xx_card_new(dev, &card);
+        err = snd_es18xx_card_new(devptr, dev, &card);
         if (err < 0)
                 return err;
-        snd_card_set_dev(card, devptr);
         if ((err = snd_audiodrive_probe(card, dev)) < 0) {
                 snd_card_free(card);
@@ -2192 +2171 @@
 }
 
-static int __devinit snd_es18xx_isa_probe(struct device *pdev, unsigned int dev)
+static int snd_es18xx_isa_probe(struct device *pdev, unsigned int dev)
 {
         int err;
-        static int possible_irqs[] = {5, 9, 10, 7, 11, 12, -1};
-        static int possible_dmas[] = {1, 0, 3, 5, -1};
+        static const int possible_irqs[] = {5, 9, 10, 7, 11, 12, -1};
+        static const int possible_dmas[] = {1, 0, 3, 5, -1};
 
         if (irq[dev] == SNDRV_AUTO_IRQ) {
@@ -2220 +2199 @@
                 return snd_es18xx_isa_probe1(dev, pdev);
         } else {
-                static unsigned long possible_ports[] = {0x220, 0x240, 0x260, 0x280};
+                static const unsigned long possible_ports[] = {0x220, 0x240, 0x260, 0x280};
                 int i;
                 for (i = 0; i < ARRAY_SIZE(possible_ports); i++) {
@@ -2232 +2211 @@
 }
 
-static int __devexit snd_es18xx_isa_remove(struct device *devptr,
-                                           unsigned int dev)
+static int snd_es18xx_isa_remove(struct device *devptr,
+                                 unsigned int dev)
 {
         snd_card_free(dev_get_drvdata(devptr));
-        dev_set_drvdata(devptr, NULL);
         return 0;
 }
@@ -2258 +2236 @@
         .match          = snd_es18xx_isa_match,
         .probe          = snd_es18xx_isa_probe,
-        .remove         = __devexit_p(snd_es18xx_isa_remove),
+        .remove         = snd_es18xx_isa_remove,
 #ifdef CONFIG_PM
         .suspend        = snd_es18xx_isa_suspend,
@@ -2270 +2248 @@
 
 #ifdef CONFIG_PNP
-static int __devinit snd_audiodrive_pnp_detect(struct pnp_dev *pdev,
-                                            const struct pnp_device_id *id)
+static int snd_audiodrive_pnp_detect(struct pnp_dev *pdev,
+                                     const struct pnp_device_id *id)
 {
         static int dev;
@@ -2286 +2264 @@
                 return -ENODEV;
 
-        err = snd_es18xx_card_new(dev, &card);
+        err = snd_es18xx_card_new(&pdev->dev, dev, &card);
         if (err < 0)
                 return err;
@@ -2293 +2271 @@
                 return err;
         }
-        snd_card_set_dev(card, &pdev->dev);
         if ((err = snd_audiodrive_probe(card, dev)) < 0) {
                 snd_card_free(card);
@@ -2303 +2280 @@
 }
 
-static void __devexit snd_audiodrive_pnp_remove(struct pnp_dev * pdev)
+static void snd_audiodrive_pnp_remove(struct pnp_dev *pdev)
 {
         snd_card_free(pnp_get_drvdata(pdev));
-        pnp_set_drvdata(pdev, NULL);
 }
 
@@ -2324 +2300 @@
         .id_table = snd_audiodrive_pnpbiosids,
         .probe = snd_audiodrive_pnp_detect,
-        .remove = __devexit_p(snd_audiodrive_pnp_remove),
+        .remove = snd_audiodrive_pnp_remove,
 #ifdef CONFIG_PM
         .suspend = snd_audiodrive_pnp_suspend,
@@ -2331 +2307 @@
 };
 
-static int __devinit snd_audiodrive_pnpc_detect(struct pnp_card_link *pcard,
-                                               const struct pnp_card_device_id *pid)
+static int snd_audiodrive_pnpc_detect(struct pnp_card_link *pcard,
+                                      const struct pnp_card_device_id *pid)
 {
         static int dev;
@@ -2345 +2321 @@
                 return -ENODEV;
 
-        res = snd_es18xx_card_new(dev, &card);
+        res = snd_es18xx_card_new(&pcard->card->dev, dev, &card);
         if (res < 0)
                 return res;
@@ -2353 +2329 @@
                 return res;
         }
-        snd_card_set_dev(card, &pcard->card->dev);
         if ((res = snd_audiodrive_probe(card, dev)) < 0) {
                 snd_card_free(card);
@@ -2364 +2339 @@
 }
 
-static void __devexit snd_audiodrive_pnpc_remove(struct pnp_card_link * pcard)
+static void snd_audiodrive_pnpc_remove(struct pnp_card_link *pcard)
 {
         snd_card_free(pnp_get_card_drvdata(pcard));
@@ -2388 +2363 @@
         .id_table = snd_audiodrive_pnpids,
         .probe = snd_audiodrive_pnpc_detect,
-        .remove = __devexit_p(snd_audiodrive_pnpc_remove),
+        .remove = snd_audiodrive_pnpc_remove,
 #ifdef CONFIG_PM
         .suspend        = snd_audiodrive_pnpc_suspend,

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

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Routines for GF1 DMA control
  *  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
- *
  */
 
@@ -202 +187 @@
 
         block = kmalloc(sizeof(*block), atomic ? GFP_ATOMIC : GFP_KERNEL);
-        if (block == NULL) {
-                snd_printk(KERN_ERR "gf1: DMA transfer failure; not enough memory\n");
+        if (!block)
                 return -ENOMEM;
-        }
+
         *block = *__block;
         block->next = NULL;

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

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  DRAM access routines
- *
- *
- *   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
- *
  */
 

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

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  I/O routines for GF1/InterWave synthesizer chips
- *
- *
- *   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
- *
  */
 
@@ -419 +404 @@
         unsigned short voices;
 
-        static unsigned short voices_tbl[32 - 14 + 1] =
+        static const unsigned short voices_tbl[32 - 14 + 1] =
         {
             44100, 41160, 38587, 36317, 34300, 32494, 30870, 29400, 28063, 26843,
@@ -462 +447 @@
                         printk(KERN_INFO " -%i- GFA1 effect volume          = 0x%x\n", voice, snd_gf1_i_read16(gus, 0x16));
                         printk(KERN_INFO " -%i- GFA1 effect volume final    = 0x%x\n", voice, snd_gf1_i_read16(gus, 0x1d));
-                        printk(KERN_INFO " -%i- GFA1 effect acumulator      = 0x%x\n", voice, snd_gf1_i_read8(gus, 0x14));
+                        printk(KERN_INFO " -%i- GFA1 effect accumulator     = 0x%x\n", voice, snd_gf1_i_read8(gus, 0x14));
                 }
                 if (mode & 0x20) {

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

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Routine for IRQ handling from GF1/InterWave chip
  *  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
- *
  */
 
@@ -141 +126 @@
 void snd_gus_irq_profile_init(struct snd_gus_card *gus)
 {
-        struct snd_info_entry *entry;
-
-        if (! snd_card_proc_new(gus->card, "gusirq", &entry))
-                snd_info_set_text_ops(entry, gus, snd_gus_irq_info_read);
+        snd_card_ro_proc_new(gus->card, "gusirq", gus, snd_gus_irq_info_read);
 }
 

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

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Routines for Gravis UltraSound soundcards
  *  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/slab.h>
 #include <linux/ioport.h>
+#include <linux/module.h>
 #include <sound/core.h>
 #include <sound/gus.h>
@@ -82 +68 @@
 }
 
-static struct snd_kcontrol_new snd_gus_joystick_control = {
+static const struct snd_kcontrol_new snd_gus_joystick_control = {
         .iface = SNDRV_CTL_ELEM_IFACE_CARD,
         .name = "Joystick Speed",
@@ -92 +78 @@
 static void snd_gus_init_control(struct snd_gus_card *gus)
 {
-        if (!gus->ace_flag)
-                snd_ctl_add(gus->card, snd_ctl_new1(&snd_gus_joystick_control, gus));
+        int ret;
+
+        if (!gus->ace_flag) {
+                ret =
+                        snd_ctl_add(gus->card,
+                                        snd_ctl_new1(&snd_gus_joystick_control,
+                                                gus));
+                if (ret)
+                        snd_printk(KERN_ERR "gus: snd_ctl_add failed: %d\n",
+                                        ret);
+        }
 }
 
@@ -140 +135 @@
         struct snd_gus_card *gus;
         int err;
-        static struct snd_device_ops ops = {
+        static const struct snd_device_ops ops = {
                 .dev_free =     snd_gus_dev_free,
         };
@@ -181 +176 @@
                 return -EBUSY;
         }
-        if (irq >= 0 && request_irq(irq, snd_gus_interrupt, IRQF_DISABLED, "GUS GF1", (void *) gus)) {
+        if (irq >= 0 && request_irq(irq, snd_gus_interrupt, 0, "GUS GF1", (void *) gus)) {
                 snd_printk(KERN_ERR "gus: can't grab irq %d\n", irq);
                 snd_gus_free(gus);
@@ -187 +182 @@
         }
         gus->gf1.irq = irq;
+        card->sync_irq = irq;
         if (request_dma(dma1, "GUS - 1")) {
                 snd_printk(KERN_ERR "gus: can't grab DMA1 %d\n", dma1);
@@ -272 +268 @@
         unsigned long flags;
         int irq, dma1, dma2;
-        static unsigned char irqs[16] =
+        static const unsigned char irqs[16] =
                 {0, 0, 1, 3, 0, 2, 0, 4, 0, 1, 0, 5, 6, 0, 0, 7};
-        static unsigned char dmas[8] =
+        static const unsigned char dmas[8] =
                 {6, 1, 0, 2, 0, 3, 4, 5};
 
@@ -465 +461 @@
 EXPORT_SYMBOL(snd_gf1_mem_free);
 EXPORT_SYMBOL(snd_gf1_mem_lock);
-
-/*
- *  INIT part
- */
-
-static int __init alsa_gus_init(void)
-{
-        return 0;
-}
-
-static void __exit alsa_gus_exit(void)
-{
-}
-
-module_init(alsa_gus_init)
-module_exit(alsa_gus_exit)

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

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  GUS's memory allocation routines / bottom layer
- *
- *
- *   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
- *
  */
 
@@ -239 +224 @@
         struct snd_gf1_mem *alloc;
         struct snd_gf1_mem_block block;
-#ifdef CONFIG_SND_DEBUG
-        struct snd_info_entry *entry;
-#endif
 
         alloc = &gus->gf1.mem_alloc;
@@ -264 +246 @@
                 return -ENOMEM;
 #ifdef CONFIG_SND_DEBUG
-        if (! snd_card_proc_new(gus->card, "gusmem", &entry))
-                snd_info_set_text_ops(entry, gus, snd_gf1_mem_info_read);
+        snd_card_ro_proc_new(gus->card, "gusmem", gus, snd_gf1_mem_info_read);
 #endif
         return 0;
@@ -311 +292 @@
         for (block = alloc->first, i = 0; block; block = block->next, i++) {
                 used += block->size;
-                snd_iprintf(buffer, "Block %i at 0x%lx onboard 0x%x size %i (0x%x):\n", i, (long) block, block->ptr, block->size, block->size);
+                snd_iprintf(buffer, "Block %i onboard 0x%x size %i (0x%x):\n", i, block->ptr, block->size, block->size);
                 if (block->share ||
                     block->share_id[0] || block->share_id[1] ||

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

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  GUS's memory access via proc filesystem
- *
- *
- *   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
- *
  */
 
@@ -53 +38 @@
 }
 
-static struct snd_info_entry_ops snd_gf1_mem_proc_ops = {
+static const struct snd_info_entry_ops snd_gf1_mem_proc_ops = {
         .read = snd_gf1_mem_proc_dump,
 };

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

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Routines for control of ICS 2101 chip and "mixer" in GF1 chip
- *
- *
- *   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
- *
  */
 
@@ -110 +95 @@
         int addr = kcontrol->private_value & 0xff;
         int change;
-        unsigned char val1, val2, oval1, oval2, tmp;
+        unsigned char val1, val2, oval1, oval2;
         
         val1 = ucontrol->value.integer.value[0] & 127;
@@ -121 +106 @@
         gus->gf1.ics_regs[addr][1] = val2;
         if (gus->ics_flag && gus->ics_flipped &&
-            (addr == SNDRV_ICS_GF1_DEV || addr == SNDRV_ICS_MASTER_DEV)) {
-                tmp = val1;
-                val1 = val2;
-                val2 = tmp;
-        }
+            (addr == SNDRV_ICS_GF1_DEV || addr == SNDRV_ICS_MASTER_DEV))
+                swap(val1, val2);
         addr <<= 3;
         outb(addr | 0, GUSP(gus, MIXCNTRLPORT));
@@ -139 +121 @@
 }
 
-static struct snd_kcontrol_new snd_gf1_controls[] = {
+static const struct snd_kcontrol_new snd_gf1_controls[] = {
 GF1_SINGLE("Master Playback Switch", 0, 1, 1),
 GF1_SINGLE("Line Switch", 0, 0, 1),
@@ -145 +127 @@
 };
 
-static struct snd_kcontrol_new snd_ics_controls[] = {
+static const struct snd_kcontrol_new snd_ics_controls[] = {
 GF1_SINGLE("Master Playback Switch", 0, 1, 1),
 ICS_DOUBLE("Master Playback Volume", 0, SNDRV_ICS_MASTER_DEV),

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

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
@@ -8 +9 @@
  *  This code emulates autoinit DMA transfer for playback, recording by GF1
  *  chip doesn't support autoinit DMA.
- *
- *
- *   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
- *
  */
 
 #include <asm/dma.h>
 #include <linux/slab.h>
+#include <linux/sched/signal.h>
+
 #include <sound/core.h>
 #include <sound/control.h>
@@ -59 +46 @@
         int final_volume;
 };
-
-static int snd_gf1_pcm_use_dma = 1;
 
 static void snd_gf1_pcm_block_change_ack(struct snd_gus_card * gus, void *private_data)
@@ -354 +339 @@
 }
 
-static int snd_gf1_pcm_playback_copy(struct snd_pcm_substream *substream,
-                                     int voice,
-                                     snd_pcm_uframes_t pos,
-                                     void __user *src,
-                                     snd_pcm_uframes_t count)
-{
-        struct snd_pcm_runtime *runtime = substream->runtime;
-        struct gus_pcm_private *pcmp = runtime->private_data;
-        unsigned int bpos, len;
-        
-        bpos = samples_to_bytes(runtime, pos) + (voice * (pcmp->dma_size / 2));
-        len = samples_to_bytes(runtime, count);
+static int get_bpos(struct gus_pcm_private *pcmp, int voice, unsigned int pos,
+                    unsigned int len)
+{
+        unsigned int bpos = pos + (voice * (pcmp->dma_size / 2));
         if (snd_BUG_ON(bpos > pcmp->dma_size))
                 return -EIO;
         if (snd_BUG_ON(bpos + len > pcmp->dma_size))
                 return -EIO;
+        return bpos;
+}
+
+static int playback_copy_ack(struct snd_pcm_substream *substream,
+                             unsigned int bpos, unsigned int len)
+{
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct gus_pcm_private *pcmp = runtime->private_data;
+        struct snd_gus_card *gus = pcmp->gus;
+        int w16, invert;
+
+        if (len > 32)
+                return snd_gf1_pcm_block_change(substream, bpos,
+                                                pcmp->memory + bpos, len);
+
+        w16 = (snd_pcm_format_width(runtime->format) == 16);
+        invert = snd_pcm_format_unsigned(runtime->format);
+        return snd_gf1_pcm_poke_block(gus, runtime->dma_area + bpos,
+                                      pcmp->memory + bpos, len, w16, invert);
+}
+
+static int snd_gf1_pcm_playback_copy(struct snd_pcm_substream *substream,
+                                     int voice, unsigned long pos,
+                                     void __user *src, unsigned long count)
+{
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct gus_pcm_private *pcmp = runtime->private_data;
+        unsigned int len = count;
+        int bpos;
+
+        bpos = get_bpos(pcmp, voice, pos, len);
+        if (bpos < 0)
+                return pos;
         if (copy_from_user(runtime->dma_area + bpos, src, len))
                 return -EFAULT;
-        if (snd_gf1_pcm_use_dma && len > 32) {
-                return snd_gf1_pcm_block_change(substream, bpos, pcmp->memory + bpos, len);
-        } else {
-                struct snd_gus_card *gus = pcmp->gus;
-                int err, w16, invert;
-
-                w16 = (snd_pcm_format_width(runtime->format) == 16);
-                invert = snd_pcm_format_unsigned(runtime->format);
-                if ((err = snd_gf1_pcm_poke_block(gus, runtime->dma_area + bpos, pcmp->memory + bpos, len, w16, invert)) < 0)
-                        return err;
-        }
-        return 0;
+        return playback_copy_ack(substream, bpos, len);
+}
+
+static int snd_gf1_pcm_playback_copy_kernel(struct snd_pcm_substream *substream,
+                                            int voice, unsigned long pos,
+                                            void *src, unsigned long count)
+{
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct gus_pcm_private *pcmp = runtime->private_data;
+        unsigned int len = count;
+        int bpos;
+
+        bpos = get_bpos(pcmp, voice, pos, len);
+        if (bpos < 0)
+                return pos;
+        memcpy(runtime->dma_area + bpos, src, len);
+        return playback_copy_ack(substream, bpos, len);
 }
 
 static int snd_gf1_pcm_playback_silence(struct snd_pcm_substream *substream,
-                                        int voice,
-                                        snd_pcm_uframes_t pos,
-                                        snd_pcm_uframes_t count)
-{
-        struct snd_pcm_runtime *runtime = substream->runtime;
-        struct gus_pcm_private *pcmp = runtime->private_data;
-        unsigned int bpos, len;
+                                        int voice, unsigned long pos,
+                                        unsigned long count)
+{
+        struct snd_pcm_runtime *runtime = substream->runtime;
+        struct gus_pcm_private *pcmp = runtime->private_data;
+        unsigned int len = count;
+        int bpos;
         
-        bpos = samples_to_bytes(runtime, pos) + (voice * (pcmp->dma_size / 2));
-        len = samples_to_bytes(runtime, count);
-        if (snd_BUG_ON(bpos > pcmp->dma_size))
-                return -EIO;
-        if (snd_BUG_ON(bpos + len > pcmp->dma_size))
-                return -EIO;
-        snd_pcm_format_set_silence(runtime->format, runtime->dma_area + bpos, count);
-        if (snd_gf1_pcm_use_dma && len > 32) {
-                return snd_gf1_pcm_block_change(substream, bpos, pcmp->memory + bpos, len);
-        } else {
-                struct snd_gus_card *gus = pcmp->gus;
-                int err, w16, invert;
-
-                w16 = (snd_pcm_format_width(runtime->format) == 16);
-                invert = snd_pcm_format_unsigned(runtime->format);
-                if ((err = snd_gf1_pcm_poke_block(gus, runtime->dma_area + bpos, pcmp->memory + bpos, len, w16, invert)) < 0)
-                        return err;
-        }
-        return 0;
+        bpos = get_bpos(pcmp, voice, pos, len);
+        if (bpos < 0)
+                return pos;
+        snd_pcm_format_set_silence(runtime->format, runtime->dma_area + bpos,
+                                   bytes_to_samples(runtime, count));
+        return playback_copy_ack(substream, bpos, len);
 }
 
@@ -422 +424 @@
         struct snd_pcm_runtime *runtime = substream->runtime;
         struct gus_pcm_private *pcmp = runtime->private_data;
-        int err;
-        
-        if ((err = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params))) < 0)
-                return err;
-        if (err > 0) {  /* change */
+
+        if (runtime->buffer_changed) {
                 struct snd_gf1_mem_block *block;
                 if (pcmp->memory > 0) {
@@ -470 +469 @@
         struct gus_pcm_private *pcmp = runtime->private_data;
 
-        snd_pcm_lib_free_pages(substream);
         if (pcmp->pvoices[0]) {
                 snd_gf1_free_voice(pcmp->gus, pcmp->pvoices[0]);
@@ -546 +544 @@
 }
 
-static struct snd_ratnum clock = {
+static const struct snd_ratnum clock = {
         .num = 9878400/16,
         .den_min = 2,
@@ -553 +551 @@
 };
 
-static struct snd_pcm_hw_constraint_ratnums hw_constraints_clocks  = {
+static const struct snd_pcm_hw_constraint_ratnums hw_constraints_clocks  = {
         .nrats = 1,
         .rats = &clock,
@@ -573 +571 @@
         if (snd_pcm_format_unsigned(params_format(hw_params)))
                 gus->gf1.pcm_rcntrl_reg |= 0x80;
-        return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
-}
-
-static int snd_gf1_pcm_capture_hw_free(struct snd_pcm_substream *substream)
-{
-        return snd_pcm_lib_free_pages(substream);
+        return 0;
 }
 
@@ -634 +627 @@
 }
 
-static struct snd_pcm_hardware snd_gf1_pcm_playback =
+static const struct snd_pcm_hardware snd_gf1_pcm_playback =
 {
         .info =                 SNDRV_PCM_INFO_NONINTERLEAVED,
@@ -652 +645 @@
 };
 
-static struct snd_pcm_hardware snd_gf1_pcm_capture =
+static const struct snd_pcm_hardware snd_gf1_pcm_capture =
 {
         .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
@@ -808 +801 @@
 }
 
-static struct snd_kcontrol_new snd_gf1_pcm_volume_control =
+static const struct snd_kcontrol_new snd_gf1_pcm_volume_control =
 {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -817 +810 @@
 };
 
-static struct snd_kcontrol_new snd_gf1_pcm_volume_control1 =
+static const struct snd_kcontrol_new snd_gf1_pcm_volume_control1 =
 {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -826 +819 @@
 };
 
-static struct snd_pcm_ops snd_gf1_pcm_playback_ops = {
+static const struct snd_pcm_ops snd_gf1_pcm_playback_ops = {
         .open =         snd_gf1_pcm_playback_open,
         .close =        snd_gf1_pcm_playback_close,
-        .ioctl =        snd_pcm_lib_ioctl,
         .hw_params =    snd_gf1_pcm_playback_hw_params,
         .hw_free =      snd_gf1_pcm_playback_hw_free,
@@ -835 +827 @@
         .trigger =      snd_gf1_pcm_playback_trigger,
         .pointer =      snd_gf1_pcm_playback_pointer,
-        .copy =         snd_gf1_pcm_playback_copy,
-        .silence =      snd_gf1_pcm_playback_silence,
+        .copy_user =    snd_gf1_pcm_playback_copy,
+        .copy_kernel =  snd_gf1_pcm_playback_copy_kernel,
+        .fill_silence = snd_gf1_pcm_playback_silence,
 };
 
-static struct snd_pcm_ops snd_gf1_pcm_capture_ops = {
+static const struct snd_pcm_ops snd_gf1_pcm_capture_ops = {
         .open =         snd_gf1_pcm_capture_open,
         .close =        snd_gf1_pcm_capture_close,
-        .ioctl =        snd_pcm_lib_ioctl,
         .hw_params =    snd_gf1_pcm_capture_hw_params,
-        .hw_free =      snd_gf1_pcm_capture_hw_free,
         .prepare =      snd_gf1_pcm_capture_prepare,
         .trigger =      snd_gf1_pcm_capture_trigger,
@@ -850 +841 @@
 };
 
-int snd_gf1_pcm_new(struct snd_gus_card * gus, int pcm_dev, int control_index, struct snd_pcm ** rpcm)
+int snd_gf1_pcm_new(struct snd_gus_card *gus, int pcm_dev, int control_index)
 {
         struct snd_card *card;
@@ -858 +849 @@
         int capture, err;
 
-        if (rpcm)
-                *rpcm = NULL;
         card = gus->card;
         capture = !gus->interwave && !gus->ess_flag && !gus->ace_flag ? 1 : 0;
@@ -875 +864 @@
 
         for (substream = pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream; substream; substream = substream->next)
-                snd_pcm_lib_preallocate_pages(substream, SNDRV_DMA_TYPE_DEV,
-                                              snd_dma_isa_data(),
-                                              64*1024, gus->gf1.dma1 > 3 ? 128*1024 : 64*1024);
+                snd_pcm_set_managed_buffer(substream, SNDRV_DMA_TYPE_DEV,
+                                           card->dev,
+                                           64*1024, gus->gf1.dma1 > 3 ? 128*1024 : 64*1024);
         
         pcm->info_flags = 0;
@@ -885 +874 @@
                 if (gus->gf1.dma2 == gus->gf1.dma1)
                         pcm->info_flags |= SNDRV_PCM_INFO_HALF_DUPLEX;
-                snd_pcm_lib_preallocate_pages(pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream,
-                                              SNDRV_DMA_TYPE_DEV, snd_dma_isa_data(),
-                                              64*1024, gus->gf1.dma2 > 3 ? 128*1024 : 64*1024);
+                snd_pcm_set_managed_buffer(pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream,
+                                           SNDRV_DMA_TYPE_DEV, card->dev,
+                                           64*1024, gus->gf1.dma2 > 3 ? 128*1024 : 64*1024);
         }
         strcpy(pcm->name, pcm->id);
@@ -904 +893 @@
         kctl->id.index = control_index;
 
-        if (rpcm)
-                *rpcm = pcm;
-        return 0;
-}
-
+        return 0;
+}
+

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

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  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 <sound/gus.h>
 
-extern void snd_gf1_timers_init(struct snd_gus_card * gus);
-extern void snd_gf1_timers_done(struct snd_gus_card * gus);
 extern int snd_gf1_synth_init(struct snd_gus_card * gus);
 extern void snd_gf1_synth_done(struct snd_gus_card * gus);
@@ -293 +276 @@
         unsigned long flags;
         void (*private_free)(struct snd_gus_voice *voice);
-        void *private_data;
 
         if (voice == NULL || !voice->use)
@@ -301 +283 @@
         spin_lock_irqsave(&gus->voice_alloc, flags);
         private_free = voice->private_free;
-        private_data = voice->private_data;
         voice->private_free = NULL;
         voice->private_data = NULL;

GPL/trunk/alsa-kernel/isa/gus/gus_tables.h

@@ +1 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 /*
  *  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
- *
  */
 

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

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Routines for Gravis UltraSound soundcards - Timers
@@ -4 +5 @@
  *
  *  GUS have similar timers as AdLib (OPL2/OPL3 chips).
- *
- *
- *   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
- *
  */
 
@@ -124 +109 @@
  */
 
-static struct snd_timer_hardware snd_gf1_timer1 =
+static const struct snd_timer_hardware snd_gf1_timer1 =
 {
         .flags =        SNDRV_TIMER_HW_STOP,
@@ -133 +118 @@
 };
 
-static struct snd_timer_hardware snd_gf1_timer2 =
+static const struct snd_timer_hardware snd_gf1_timer2 =
 {
         .flags =        SNDRV_TIMER_HW_STOP,

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

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Routines for the GF1 MIDI interface - like UART 6850
- *
- *
- *   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
- *
  */
 
@@ -29 +14 @@
 {
         int count;
-        unsigned char stat, data, byte;
+        unsigned char stat, byte;
+        __always_unused unsigned char data;
         unsigned long flags;
 
@@ -228 +214 @@
 }
 
-static struct snd_rawmidi_ops snd_gf1_uart_output =
+static const struct snd_rawmidi_ops snd_gf1_uart_output =
 {
         .open =         snd_gf1_uart_output_open,
@@ -235 +221 @@
 };
 
-static struct snd_rawmidi_ops snd_gf1_uart_input =
+static const struct snd_rawmidi_ops snd_gf1_uart_input =
 {
         .open =         snd_gf1_uart_input_open,
@@ -242 +228 @@
 };
 
-int snd_gf1_rawmidi_new(struct snd_gus_card * gus, int device, struct snd_rawmidi ** rrawmidi)
+int snd_gf1_rawmidi_new(struct snd_gus_card *gus, int device)
 {
         struct snd_rawmidi *rmidi;
         int err;
 
-        if (rrawmidi)
-                *rrawmidi = NULL;
         if ((err = snd_rawmidi_new(gus->card, "GF1", device, 1, 1, &rmidi)) < 0)
                 return err;
@@ -257 +241 @@
         rmidi->private_data = gus;
         gus->midi_uart = rmidi;
-        if (rrawmidi)
-                *rrawmidi = rmidi;
         return err;
 }

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

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  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
- *
  */
 
 #include <linux/time.h>
+#include <linux/export.h>
 #include <sound/core.h>
 #include <sound/gus.h>
@@ -77 +63 @@
                                     unsigned int us)
 {
-        static unsigned char vol_rates[19] =
+        static const unsigned char vol_rates[19] =
         {
                 23, 24, 26, 28, 29, 31, 32, 34,
@@ -128 +114 @@
 short snd_gf1_compute_vibrato(short cents, unsigned short fc_register)
 {
-        static short vibrato_table[] =
+        static const short vibrato_table[] =
         {
                 0, 0, 32, 592, 61, 1175, 93, 1808,
@@ -136 +122 @@
 
         long depth;
-        short *vi1, *vi2, pcents, v1;
+        const short *vi1, *vi2;
+        short pcents, v1;
 
         pcents = cents < 0 ? -cents : cents;
@@ -160 +147 @@
 unsigned short snd_gf1_compute_pitchbend(unsigned short pitchbend, unsigned short sens)
 {
-        static long log_table[] = {1024, 1085, 1149, 1218, 1290, 1367, 1448, 1534, 1625, 1722, 1825, 1933};
+        static const long log_table[] = {1024, 1085, 1149, 1218, 1290, 1367, 1448, 1534, 1625, 1722, 1825, 1933};
         int wheel, sensitivity;
         unsigned int mantissa, f1, f2;

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

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Driver for Gravis UltraSound Classic 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>
@@ -43 +28 @@
 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;        /* 3,5,9,11,12,15 */
@@ -59 +44 @@
 module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable " CRD_NAME " soundcard.");
-module_param_array(port, long, NULL, 0444);
+module_param_hw_array(port, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(port, "Port # for " CRD_NAME " driver.");
-module_param_array(irq, int, NULL, 0444);
+module_param_hw_array(irq, int, irq, NULL, 0444);
 MODULE_PARM_DESC(irq, "IRQ # for " CRD_NAME " driver.");
-module_param_array(dma1, int, NULL, 0444);
+module_param_hw_array(dma1, int, dma, NULL, 0444);
 MODULE_PARM_DESC(dma1, "DMA1 # for " CRD_NAME " driver.");
-module_param_array(dma2, int, NULL, 0444);
+module_param_hw_array(dma2, int, dma, NULL, 0444);
 MODULE_PARM_DESC(dma2, "DMA2 # for " CRD_NAME " driver.");
 module_param_array(joystick_dac, int, NULL, 0444);
@@ -74 +59 @@
 MODULE_PARM_DESC(pcm_channels, "Reserved PCM channels for " CRD_NAME " driver.");
 
-static int __devinit snd_gusclassic_match(struct device *dev, unsigned int n)
+static int snd_gusclassic_match(struct device *dev, unsigned int n)
 {
         return enable[n];
 }
 
-static int __devinit snd_gusclassic_create(struct snd_card *card,
-                struct device *dev, unsigned int n, struct snd_gus_card **rgus)
-{
-        static long possible_ports[] = {0x220, 0x230, 0x240, 0x250, 0x260};
-        static int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, 4, -1};
-        static int possible_dmas[] = {5, 6, 7, 1, 3, -1};
+static int snd_gusclassic_create(struct snd_card *card,
+                                 struct device *dev, unsigned int n,
+                                 struct snd_gus_card **rgus)
+{
+        static const long possible_ports[] = {0x220, 0x230, 0x240, 0x250, 0x260};
+        static const int possible_irqs[] = {5, 11, 12, 9, 7, 15, 3, 4, -1};
+        static const int possible_dmas[] = {5, 6, 7, 1, 3, -1};
 
         int i, error;
@@ -124 +110 @@
 }
 
-static int __devinit snd_gusclassic_detect(struct snd_gus_card *gus)
+static int snd_gusclassic_detect(struct snd_gus_card *gus)
 {
         unsigned char d;
@@ -143 +129 @@
 }
 
-static int __devinit snd_gusclassic_probe(struct device *dev, unsigned int n)
+static int snd_gusclassic_probe(struct device *dev, unsigned int n)
 {
         struct snd_card *card;
@@ -149 +135 @@
         int error;
 
-        error = snd_card_create(index[n], id[n], THIS_MODULE, 0, &card);
+        error = snd_card_new(dev, index[n], id[n], THIS_MODULE, 0, &card);
         if (error < 0)
                 return error;
@@ -181 +167 @@
                 goto out;
 
-        error = snd_gf1_pcm_new(gus, 0, 0, NULL);
+        error = snd_gf1_pcm_new(gus, 0, 0);
         if (error < 0)
                 goto out;
 
         if (!gus->ace_flag) {
-                error = snd_gf1_rawmidi_new(gus, 0, NULL);
+                error = snd_gf1_rawmidi_new(gus, 0);
                 if (error < 0)
                         goto out;
@@ -199 +185 @@
                         "&%d", gus->gf1.dma2);
 
-        snd_card_set_dev(card, dev);
-
         error = snd_card_register(card);
         if (error < 0)
@@ -212 +196 @@
 }
 
-static int __devexit snd_gusclassic_remove(struct device *dev, unsigned int n)
+static int snd_gusclassic_remove(struct device *dev, unsigned int n)
 {
         snd_card_free(dev_get_drvdata(dev));
-        dev_set_drvdata(dev, NULL);
         return 0;
 }
@@ -222 +205 @@
         .match          = snd_gusclassic_match,
         .probe          = snd_gusclassic_probe,
-        .remove         = __devexit_p(snd_gusclassic_remove),
+        .remove         = snd_gusclassic_remove,
 #if 0   /* FIXME */
         .suspend        = snd_gusclassic_suspend,
@@ -232 +215 @@
 };
 
-static int __init alsa_card_gusclassic_init(void)
-{
-        return isa_register_driver(&snd_gusclassic_driver, SNDRV_CARDS);
-}
-
-static void __exit alsa_card_gusclassic_exit(void)
-{
-        isa_unregister_driver(&snd_gusclassic_driver);
-}
-
-module_init(alsa_card_gusclassic_init);
-module_exit(alsa_card_gusclassic_exit);
+module_isa_driver(snd_gusclassic_driver, SNDRV_CARDS);

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

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Driver for Gravis UltraSound Extreme soundcards
  *  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>
@@ -47 +32 @@
 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,0x240,0x260 */
 static long gf1_port[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS) - 1] = -1}; /* 0x210,0x220,0x230,0x240,0x250,0x260,0x270 */
@@ -67 +52 @@
 module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable " CRD_NAME " soundcard.");
-module_param_array(port, long, NULL, 0444);
+module_param_hw_array(port, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(port, "Port # for " CRD_NAME " driver.");
-module_param_array(gf1_port, long, NULL, 0444);
+module_param_hw_array(gf1_port, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(gf1_port, "GF1 port # for " CRD_NAME " driver (optional).");
-module_param_array(mpu_port, long, NULL, 0444);
+module_param_hw_array(mpu_port, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(mpu_port, "MPU-401 port # for " CRD_NAME " driver.");
-module_param_array(irq, int, NULL, 0444);
+module_param_hw_array(irq, int, irq, NULL, 0444);
 MODULE_PARM_DESC(irq, "IRQ # for " CRD_NAME " driver.");
-module_param_array(mpu_irq, int, NULL, 0444);
+module_param_hw_array(mpu_irq, int, irq, NULL, 0444);
 MODULE_PARM_DESC(mpu_irq, "MPU-401 IRQ # for " CRD_NAME " driver.");
-module_param_array(gf1_irq, int, NULL, 0444);
+module_param_hw_array(gf1_irq, int, irq, NULL, 0444);
 MODULE_PARM_DESC(gf1_irq, "GF1 IRQ # for " CRD_NAME " driver.");
-module_param_array(dma8, int, NULL, 0444);
+module_param_hw_array(dma8, int, dma, NULL, 0444);
 MODULE_PARM_DESC(dma8, "8-bit DMA # for " CRD_NAME " driver.");
-module_param_array(dma1, int, NULL, 0444);
+module_param_hw_array(dma1, int, dma, NULL, 0444);
 MODULE_PARM_DESC(dma1, "GF1 DMA # for " CRD_NAME " driver.");
 module_param_array(joystick_dac, int, NULL, 0444);
@@ -90 +75 @@
 MODULE_PARM_DESC(pcm_channels, "Reserved PCM channels for " CRD_NAME " driver.");
 
-static int __devinit snd_gusextreme_match(struct device *dev, unsigned int n)
+static int snd_gusextreme_match(struct device *dev, unsigned int n)
 {
         return enable[n];
 }
 
-static int __devinit snd_gusextreme_es1688_create(struct snd_card *card,
-                struct snd_es1688 *chip, struct device *dev, unsigned int n)
-{
-        static long possible_ports[] = {0x220, 0x240, 0x260};
-        static int possible_irqs[] = {5, 9, 10, 7, -1};
-        static int possible_dmas[] = {1, 3, 0, -1};
+static int snd_gusextreme_es1688_create(struct snd_card *card,
+                                        struct snd_es1688 *chip,
+                                        struct device *dev, unsigned int n)
+{
+        static const long possible_ports[] = {0x220, 0x240, 0x260};
+        static const int possible_irqs[] = {5, 9, 10, 7, -1};
+        static const int possible_dmas[] = {1, 3, 0, -1};
 
         int i, error;
@@ -133 +119 @@
 }
 
-static int __devinit snd_gusextreme_gus_card_create(struct snd_card *card,
-                struct device *dev, unsigned int n, struct snd_gus_card **rgus)
-{
-        static int possible_irqs[] = {11, 12, 15, 9, 5, 7, 3, -1};
-        static int possible_dmas[] = {5, 6, 7, 3, 1, -1};
+static int snd_gusextreme_gus_card_create(struct snd_card *card,
+                                          struct device *dev, unsigned int n,
+                                          struct snd_gus_card **rgus)
+{
+        static const int possible_irqs[] = {11, 12, 15, 9, 5, 7, 3, -1};
+        static const int possible_dmas[] = {5, 6, 7, 3, 1, -1};
 
         if (gf1_irq[n] == SNDRV_AUTO_IRQ) {
@@ -157 +144 @@
 }
 
-static int __devinit snd_gusextreme_detect(struct snd_gus_card *gus,
-        struct snd_es1688 *es1688)
+static int snd_gusextreme_detect(struct snd_gus_card *gus,
+                                 struct snd_es1688 *es1688)
 {
         unsigned long flags;
@@ -207 +194 @@
 }
 
-static int __devinit snd_gusextreme_mixer(struct snd_card *card)
+static int snd_gusextreme_mixer(struct snd_card *card)
 {
         struct snd_ctl_elem_id id1, id2;
@@ -233 +220 @@
 }
 
-static int __devinit snd_gusextreme_probe(struct device *dev, unsigned int n)
+static int snd_gusextreme_probe(struct device *dev, unsigned int n)
 {
         struct snd_card *card;
@@ -241 +228 @@
         int error;
 
-        error = snd_card_create(index[n], id[n], THIS_MODULE,
-                                sizeof(struct snd_es1688), &card);
+        error = snd_card_new(dev, index[n], id[n], THIS_MODULE,
+                             sizeof(struct snd_es1688), &card);
         if (error < 0)
                 return error;
@@ -283 +270 @@
         gus->codec_flag = 1;
 
-        error = snd_es1688_pcm(card, es1688, 0, NULL);
+        error = snd_es1688_pcm(card, es1688, 0);
         if (error < 0)
                 goto out;
@@ -294 +281 @@
 
         if (pcm_channels[n] > 0) {
-                error = snd_gf1_pcm_new(gus, 1, 1, NULL);
+                error = snd_gf1_pcm_new(gus, 1, 1);
                 if (error < 0)
                         goto out;
@@ -318 +305 @@
         if (es1688->mpu_port >= 0x300) {
                 error = snd_mpu401_uart_new(card, 0, MPU401_HW_ES1688,
-                                es1688->mpu_port, 0,
-                                mpu_irq[n], IRQF_DISABLED, NULL);
+                                es1688->mpu_port, 0, mpu_irq[n], NULL);
                 if (error < 0)
                         goto out;
@@ -328 +314 @@
                 gus->gf1.irq, es1688->irq, gus->gf1.dma1, es1688->dma8);
 
-        snd_card_set_dev(card, dev);
-
         error = snd_card_register(card);
         if (error < 0)
@@ -341 +325 @@
 }
 
-static int __devexit snd_gusextreme_remove(struct device *dev, unsigned int n)
+static int snd_gusextreme_remove(struct device *dev, unsigned int n)
 {
         snd_card_free(dev_get_drvdata(dev));
-        dev_set_drvdata(dev, NULL);
         return 0;
 }
@@ -351 +334 @@
         .match          = snd_gusextreme_match,
         .probe          = snd_gusextreme_probe,
-        .remove         = __devexit_p(snd_gusextreme_remove),
+        .remove         = snd_gusextreme_remove,
 #if 0   /* FIXME */
         .suspend        = snd_gusextreme_suspend,
@@ -361 +344 @@
 };
 
-static int __init alsa_card_gusextreme_init(void)
-{
-        return isa_register_driver(&snd_gusextreme_driver, SNDRV_CARDS);
-}
-
-static void __exit alsa_card_gusextreme_exit(void)
-{
-        isa_unregister_driver(&snd_gusextreme_driver);
-}
-
-module_init(alsa_card_gusextreme_init);
-module_exit(alsa_card_gusextreme_exit);
+module_isa_driver(snd_gusextreme_driver, SNDRV_CARDS);

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);

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 */
 };

GPL/trunk/alsa-kernel/isa/opl3sa2.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Driver for Yamaha OPL3-SA[2,3] soundcards
  *  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
- *
  */
 
@@ -26 +11 @@
 #include <linux/pm.h>
 #include <linux/pnp.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
+#include <linux/io.h>
 #include <sound/core.h>
 #include <sound/wss.h>
@@ -33 +19 @@
 #include <sound/initval.h>
 #include <sound/tlv.h>
-
-#include <asm/io.h>
 
 MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
@@ -47 +31 @@
 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
 #ifndef TARGET_OS2
-static int isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
+static bool isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
 #else
 static int isapnp[SNDRV_CARDS] = {1,1,1,1,1,1,1,1};
@@ -75 +59 @@
 MODULE_PARM_DESC(isapnp, "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 OPL3-SA driver.");
-module_param_array(sb_port, long, NULL, 0444);
+module_param_hw_array(sb_port, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(sb_port, "SB port # for OPL3-SA driver.");
-module_param_array(wss_port, long, NULL, 0444);
+module_param_hw_array(wss_port, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(wss_port, "WSS port # for OPL3-SA driver.");
-module_param_array(fm_port, long, NULL, 0444);
+module_param_hw_array(fm_port, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(fm_port, "FM port # for OPL3-SA driver.");
-module_param_array(midi_port, long, NULL, 0444);
+module_param_hw_array(midi_port, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(midi_port, "MIDI port # for OPL3-SA driver.");
-module_param_array(irq, int, NULL, 0444);
+module_param_hw_array(irq, int, irq, NULL, 0444);
 MODULE_PARM_DESC(irq, "IRQ # for OPL3-SA driver.");
-module_param_array(dma1, int, NULL, 0444);
+module_param_hw_array(dma1, int, dma, NULL, 0444);
 MODULE_PARM_DESC(dma1, "DMA1 # for OPL3-SA driver.");
-module_param_array(dma2, int, NULL, 0444);
+module_param_hw_array(dma2, int, dma, NULL, 0444);
 MODULE_PARM_DESC(dma2, "DMA2 # for OPL3-SA driver.");
 module_param_array(opl3sa3_ymode, int, NULL, 0444);
@@ -147 +131 @@
 #ifdef CONFIG_PNP
 
-static struct pnp_device_id snd_opl3sa2_pnpbiosids[] = {
+static const struct pnp_device_id snd_opl3sa2_pnpbiosids[] = {
         { .id = "YMH0021" },
         { .id = "NMX2210" },    /* Gateway Solo 2500 */
@@ -155 +139 @@
 MODULE_DEVICE_TABLE(pnp, snd_opl3sa2_pnpbiosids);
 
-static struct pnp_card_device_id snd_opl3sa2_pnpids[] = {
+static const struct pnp_card_device_id snd_opl3sa2_pnpids[] = {
         /* Yamaha YMF719E-S (Genius Sound Maker 3DX) */
         { .id = "YMH0020", .devs = { { "YMH0021" } } },
@@ -226 +210 @@
 }
 
-static int __devinit snd_opl3sa2_detect(struct snd_card *card)
+static int snd_opl3sa2_detect(struct snd_card *card)
 {
         struct snd_opl3sa2 *chip = card->private_data;
@@ -478 +462 @@
 static const DECLARE_TLV_DB_SCALE(db_scale_5bit_12db_max, -3450, 150, 0);
 
-static struct snd_kcontrol_new snd_opl3sa2_controls[] = {
+static const struct snd_kcontrol_new snd_opl3sa2_controls[] = {
 OPL3SA2_DOUBLE("Master Playback Switch", 0, 0x07, 0x08, 7, 7, 1, 1),
 OPL3SA2_DOUBLE_TLV("Master Playback Volume", 0, 0x07, 0x08, 0, 0, 15, 1,
@@ -488 +472 @@
 };
 
-static struct snd_kcontrol_new snd_opl3sa2_tone_controls[] = {
+static const struct snd_kcontrol_new snd_opl3sa2_tone_controls[] = {
 OPL3SA2_DOUBLE("3D Control - Wide", 0, 0x14, 0x14, 4, 0, 7, 0),
 OPL3SA2_DOUBLE("Tone Control - Bass", 0, 0x15, 0x15, 4, 0, 7, 0),
@@ -501 +485 @@
 }
 
-static int __devinit snd_opl3sa2_mixer(struct snd_card *card)
+static int snd_opl3sa2_mixer(struct snd_card *card)
 {
         struct snd_opl3sa2 *chip = card->private_data;
@@ -601 +585 @@
 
 #ifdef CONFIG_PNP
-static int __devinit snd_opl3sa2_pnp(int dev, struct snd_opl3sa2 *chip,
-                                     struct pnp_dev *pdev)
+static int snd_opl3sa2_pnp(int dev, struct snd_opl3sa2 *chip,
+                           struct pnp_dev *pdev)
 {
         if (pnp_activate_dev(pdev) < 0) {
@@ -632 +616 @@
 }
 
-static int snd_opl3sa2_card_new(int dev, struct snd_card **cardp)
+static int snd_opl3sa2_card_new(struct device *pdev, int dev,
+                                struct snd_card **cardp)
 {
         struct snd_card *card;
@@ -638 +623 @@
         int err;
 
-        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
-                              sizeof(struct snd_opl3sa2), &card);
+        err = snd_card_new(pdev, index[dev], id[dev], THIS_MODULE,
+                           sizeof(struct snd_opl3sa2), &card);
         if (err < 0)
                 return err;
@@ -652 +637 @@
 }
 
-static int __devinit snd_opl3sa2_probe(struct snd_card *card, int dev)
+static int snd_opl3sa2_probe(struct snd_card *card, int dev)
 {
         int xirq, xdma1, xdma2;
@@ -672 +657 @@
         if (err < 0)
                 return err;
-        err = request_irq(xirq, snd_opl3sa2_interrupt, IRQF_DISABLED,
+        err = request_irq(xirq, snd_opl3sa2_interrupt, 0,
                           "OPL3-SA2", card);
         if (err) {
@@ -679 +664 @@
         }
         chip->irq = xirq;
+        card->sync_irq = chip->irq;
         err = snd_wss_create(card,
                              wss_port[dev] + 4, -1,
@@ -688 +674 @@
         }
         chip->wss = wss;
-        err = snd_wss_pcm(wss, 0, NULL);
+        err = snd_wss_pcm(wss, 0);
         if (err < 0)
                 return err;
@@ -697 +683 @@
         if (err < 0)
                 return err;
-        err = snd_wss_timer(wss, 0, NULL);
+        err = snd_wss_timer(wss, 0);
         if (err < 0)
                 return err;
@@ -712 +698 @@
         if (midi_port[dev] >= 0x300 && midi_port[dev] < 0x340) {
                 if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_OPL3SA2,
-                                               midi_port[dev], 0,
-                                               xirq, 0, &chip->rmidi)) < 0)
+                                               midi_port[dev],
+                                               MPU401_INFO_IRQ_HOOK, -1,
+                                               &chip->rmidi)) < 0)
                         return err;
         }
@@ -725 +712 @@
 
 #ifdef CONFIG_PNP
-static int __devinit snd_opl3sa2_pnp_detect(struct pnp_dev *pdev,
-                                            const struct pnp_device_id *id)
+static int snd_opl3sa2_pnp_detect(struct pnp_dev *pdev,
+                                  const struct pnp_device_id *id)
 {
         static int dev;
@@ -741 +728 @@
                 return -ENODEV;
 
-        err = snd_opl3sa2_card_new(dev, &card);
+        err = snd_opl3sa2_card_new(&pdev->dev, dev, &card);
         if (err < 0)
                 return err;
@@ -748 +735 @@
                 return err;
         }
-        snd_card_set_dev(card, &pdev->dev);
         if ((err = snd_opl3sa2_probe(card, dev)) < 0) {
                 snd_card_free(card);
@@ -758 +744 @@
 }
 
-static void __devexit snd_opl3sa2_pnp_remove(struct pnp_dev * pdev)
+static void snd_opl3sa2_pnp_remove(struct pnp_dev *pdev)
 {
         snd_card_free(pnp_get_drvdata(pdev));
-        pnp_set_drvdata(pdev, NULL);
 }
 
@@ -779 +764 @@
         .id_table = snd_opl3sa2_pnpbiosids,
         .probe = snd_opl3sa2_pnp_detect,
-        .remove = __devexit_p(snd_opl3sa2_pnp_remove),
+        .remove = snd_opl3sa2_pnp_remove,
 #ifdef CONFIG_PM
         .suspend = snd_opl3sa2_pnp_suspend,
@@ -786 +771 @@
 };
 
-static int __devinit snd_opl3sa2_pnp_cdetect(struct pnp_card_link *pcard,
-                                             const struct pnp_card_device_id *id)
+static int snd_opl3sa2_pnp_cdetect(struct pnp_card_link *pcard,
+                                   const struct pnp_card_device_id *id)
 {
         static int dev;
@@ -807 +792 @@
                 return -ENODEV;
 
-        err = snd_opl3sa2_card_new(dev, &card);
+        err = snd_opl3sa2_card_new(&pdev->dev, dev, &card);
         if (err < 0)
                 return err;
@@ -814 +799 @@
                 return err;
         }
-        snd_card_set_dev(card, &pdev->dev);
         if ((err = snd_opl3sa2_probe(card, dev)) < 0) {
                 snd_card_free(card);
@@ -824 +808 @@
 }
 
-static void __devexit snd_opl3sa2_pnp_cremove(struct pnp_card_link * pcard)
+static void snd_opl3sa2_pnp_cremove(struct pnp_card_link *pcard)
 {
         snd_card_free(pnp_get_card_drvdata(pcard));
@@ -846 +830 @@
         .id_table = snd_opl3sa2_pnpids,
         .probe = snd_opl3sa2_pnp_cdetect,
-        .remove = __devexit_p(snd_opl3sa2_pnp_cremove),
+        .remove = snd_opl3sa2_pnp_cremove,
 #ifdef CONFIG_PM
         .suspend = snd_opl3sa2_pnp_csuspend,
@@ -854 +838 @@
 #endif /* CONFIG_PNP */
 
-static int __devinit snd_opl3sa2_isa_match(struct device *pdev,
-                                           unsigned int dev)
+static int snd_opl3sa2_isa_match(struct device *pdev,
+                                 unsigned int dev)
 {
         if (!enable[dev])
@@ -882 +866 @@
 }
 
-static int __devinit snd_opl3sa2_isa_probe(struct device *pdev,
-                                           unsigned int dev)
+static int snd_opl3sa2_isa_probe(struct device *pdev,
+                                 unsigned int dev)
 {
         struct snd_card *card;
         int err;
 
-        err = snd_opl3sa2_card_new(dev, &card);
+        err = snd_opl3sa2_card_new(pdev, dev, &card);
         if (err < 0)
                 return err;
-        snd_card_set_dev(card, pdev);
         if ((err = snd_opl3sa2_probe(card, dev)) < 0) {
                 snd_card_free(card);
@@ -900 +883 @@
 }
 
-static int __devexit snd_opl3sa2_isa_remove(struct device *devptr,
-                                            unsigned int dev)
+static int snd_opl3sa2_isa_remove(struct device *devptr,
+                                  unsigned int dev)
 {
         snd_card_free(dev_get_drvdata(devptr));
-        dev_set_drvdata(devptr, NULL);
         return 0;
 }
@@ -926 +908 @@
         .match          = snd_opl3sa2_isa_match,
         .probe          = snd_opl3sa2_isa_probe,
-        .remove         = __devexit_p(snd_opl3sa2_isa_remove),
+        .remove         = snd_opl3sa2_isa_remove,
 #ifdef CONFIG_PM
         .suspend        = snd_opl3sa2_isa_suspend,

GPL/trunk/alsa-kernel/isa/opti9xx/opti92x-ad1848.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
     card-opti92x-ad1848.c - driver for OPTi 82c92x based soundcards.
@@ -8 +9 @@
     Thanks to Maria Grazia Pollarini, Salvatore Vassallo.
 
-    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
 */
 
@@ -29 +17 @@
 #include <linux/delay.h>
 #include <linux/pnp.h>
-#include <linux/moduleparam.h>
-#include <asm/io.h>
+#include <linux/module.h>
+#include <linux/io.h>
 #include <asm/dma.h>
 #include <sound/core.h>
@@ -40 +28 @@
 #include <sound/opl4.h>
 #endif
+#define SNDRV_LEGACY_FIND_FREE_IOPORT
 #define SNDRV_LEGACY_FIND_FREE_IRQ
 #define SNDRV_LEGACY_FIND_FREE_DMA
@@ -64 +53 @@
 static int index = SNDRV_DEFAULT_IDX1;  /* Index 0-MAX */
 static char *id = SNDRV_DEFAULT_STR1;           /* ID for this card */
-//static int enable = SNDRV_DEFAULT_ENABLE1;    /* Enable this card */
+//static bool enable = SNDRV_DEFAULT_ENABLE1;   /* Enable this card */
 #ifdef CONFIG_PNP
-static int isapnp = 1;                  /* Enable ISA PnP detection */
+static bool isapnp = true;                      /* Enable ISA PnP detection */
 #endif
 static long port = SNDRV_DEFAULT_PORT1;         /* 0x530,0xe80,0xf40,0x604 */
@@ -88 +77 @@
 MODULE_PARM_DESC(isapnp, "Enable ISA PnP detection for specified soundcard.");
 #endif
-module_param(port, long, 0444);
+module_param_hw(port, long, ioport, 0444);
 MODULE_PARM_DESC(port, "WSS port # for opti9xx driver.");
-module_param(mpu_port, long, 0444);
+module_param_hw(mpu_port, long, ioport, 0444);
 MODULE_PARM_DESC(mpu_port, "MPU-401 port # for opti9xx driver.");
-module_param(fm_port, long, 0444);
+module_param_hw(fm_port, long, ioport, 0444);
 MODULE_PARM_DESC(fm_port, "FM port # for opti9xx driver.");
-module_param(irq, int, 0444);
+module_param_hw(irq, int, irq, 0444);
 MODULE_PARM_DESC(irq, "WSS irq # for opti9xx driver.");
-module_param(mpu_irq, int, 0444);
+module_param_hw(mpu_irq, int, irq, 0444);
 MODULE_PARM_DESC(mpu_irq, "MPU-401 irq # for opti9xx driver.");
-module_param(dma1, int, 0444);
+module_param_hw(dma1, int, dma, 0444);
 MODULE_PARM_DESC(dma1, "1st dma # for opti9xx driver.");
 #if defined(CS4231) || defined(OPTi93X)
-module_param(dma2, int, 0444);
+module_param_hw(dma2, int, dma, 0444);
 MODULE_PARM_DESC(dma2, "2nd dma # for opti9xx driver.");
 #endif  /* CS4231 || OPTi93X */
@@ -136 +125 @@
 #ifdef OPTi93X
         unsigned long mc_indir_index;
-        unsigned long mc_indir_size;
         struct resource *res_mc_indir;
+#endif  /* OPTi93X */
         struct snd_wss *codec;
-#endif  /* OPTi93X */
         unsigned long pwd_reg;
 
@@ -152 +140 @@
 #ifdef CONFIG_PNP
 
-static struct pnp_card_device_id snd_opti9xx_pnpids[] = {
+static const struct pnp_card_device_id snd_opti9xx_pnpids[] = {
 #ifndef OPTi93X
         /* OPTi 82C924 */
@@ -174 +162 @@
 #endif  /* CONFIG_PNP */
 
-#ifdef OPTi93X
-#define DEV_NAME "opti93x"
-#else
-#define DEV_NAME "opti92x"
-#endif
-
-static char * snd_opti9xx_names[] = {
+#define DEV_NAME KBUILD_MODNAME
+
+static const char * const snd_opti9xx_names[] = {
         "unknown",
         "82C928",       "82C929",
@@ -187 +171 @@
 };
 
-
-static long __devinit snd_legacy_find_free_ioport(long *port_table, long size)
-{
-        while (*port_table != -1) {
-                if (request_region(*port_table, size, "ALSA test")) {
-                        release_region(*port_table, size);
-                        return *port_table;
-                }
-                port_table++;
-        }
-        return -1;
-}
-
-static int __devinit snd_opti9xx_init(struct snd_opti9xx *chip,
-                                      unsigned short hardware)
-{
-        static int opti9xx_mc_size[] = {7, 7, 10, 10, 2, 2, 2};
+static int snd_opti9xx_init(struct snd_opti9xx *chip,
+                            unsigned short hardware)
+{
+        static const int opti9xx_mc_size[] = {7, 7, 10, 10, 2, 2, 2};
 
         chip->hardware = hardware;
@@ -246 +217 @@
         case OPTi9XX_HW_82C933:
                 chip->mc_base = (hardware == OPTi9XX_HW_82C930) ? 0xf8f : 0xf8d;
-                if (!chip->mc_indir_index) {
+                if (!chip->mc_indir_index)
                         chip->mc_indir_index = 0xe0e;
-                        chip->mc_indir_size = 2;
-                }
                 chip->password = 0xe4;
                 chip->pwd_reg = 0;
@@ -281 +250 @@
                         break;
                 }
+                fallthrough;
 
         case OPTi9XX_HW_82C928:
@@ -323 +293 @@
                         break;
                 }
+                fallthrough;
 
         case OPTi9XX_HW_82C928:
@@ -347 +318 @@
 
 
-#define snd_opti9xx_write_mask(chip, reg, value, mask)  \
-        snd_opti9xx_write(chip, reg,                    \
-                (snd_opti9xx_read(chip, reg) & ~(mask)) | ((value) & (mask)))
-
-
-static int __devinit snd_opti9xx_configure(struct snd_opti9xx *chip,
+static inline void snd_opti9xx_write_mask(struct snd_opti9xx *chip,
+                unsigned char reg, unsigned char value, unsigned char mask)
+{
+        unsigned char oldval = snd_opti9xx_read(chip, reg);
+
+        snd_opti9xx_write(chip, reg, (oldval & ~mask) | (value & mask));
+}
+
+static int snd_opti9xx_configure(struct snd_opti9xx *chip,
                                            long port,
                                            int irq, int dma1, int dma2,
@@ -370 +344 @@
                 /* enable wave audio */
                 snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(6), 0x02, 0x02);
+                fallthrough;
 
         case OPTi9XX_HW_82C925:
@@ -404 +379 @@
 #else   /* OPTi93X */
         case OPTi9XX_HW_82C931:
+                /* disable 3D sound (set GPIO1 as output, low) */
+                snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(20), 0x04, 0x0c);
+                fallthrough;
+
         case OPTi9XX_HW_82C933:
                 /*
@@ -415 +394 @@
                  */
                 snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(26), 0x01, 0x01);
-        case OPTi9XX_HW_82C930: /* FALL THROUGH */
+                fallthrough;
+
+        case OPTi9XX_HW_82C930:
                 snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(6), 0x02, 0x03);
                 snd_opti9xx_write_mask(chip, OPTi9XX_MC_REG(3), 0x00, 0xff);
@@ -575 +556 @@
 static const DECLARE_TLV_DB_SCALE(db_scale_4bit_12db_max, -3300, 300, 0);
 
-static struct snd_kcontrol_new snd_opti93x_controls[] = {
+static const struct snd_kcontrol_new snd_opti93x_controls[] = {
 WSS_DOUBLE("Master Playback Switch", 0,
                 OPTi93X_OUT_LEFT, OPTi93X_OUT_RIGHT, 7, 7, 1, 1),
@@ -607 +588 @@
 };
 
-static int __devinit snd_opti93x_mixer(struct snd_wss *chip)
+static int snd_opti93x_mixer(struct snd_wss *chip)
 {
         struct snd_card *card;
@@ -680 +661 @@
 #endif /* OPTi93X */
 
-static int __devinit snd_opti9xx_read_check(struct snd_opti9xx *chip)
+static int snd_opti9xx_read_check(struct snd_opti9xx *chip)
 {
         unsigned char value;
@@ -697 +678 @@
                         return 0;
 #else   /* OPTi93X */
-        chip->res_mc_indir = request_region(chip->mc_indir_index,
-                                            chip->mc_indir_size,
+        chip->res_mc_indir = request_region(chip->mc_indir_index, 2,
                                             "OPTi93x MC");
         if (chip->res_mc_indir == NULL)
@@ -722 +702 @@
 }
 
-static int __devinit snd_card_opti9xx_detect(struct snd_card *card,
-                                             struct snd_opti9xx *chip)
+static int snd_card_opti9xx_detect(struct snd_card *card,
+                                   struct snd_opti9xx *chip)
 {
         int i, err;
@@ -747 +727 @@
 
 #ifdef CONFIG_PNP
-static int __devinit snd_card_opti9xx_pnp(struct snd_opti9xx *chip,
-                                          struct pnp_card_link *card,
-                                          const struct pnp_card_device_id *pid)
+static int snd_card_opti9xx_pnp(struct snd_opti9xx *chip,
+                                struct pnp_card_link *card,
+                                const struct pnp_card_device_id *pid)
 {
         struct pnp_dev *pdev;
@@ -771 +751 @@
         port = pnp_port_start(pdev, 0) - 4;
         fm_port = pnp_port_start(pdev, 1) + 8;
-        chip->mc_indir_index = pnp_port_start(pdev, 3) + 2;
-        chip->mc_indir_size = pnp_port_len(pdev, 3) - 2;
+        /* adjust mc_indir_index - some cards report it at 0xe?d,
+           other at 0xe?c but it really is always at 0xe?e */
+        chip->mc_indir_index = (pnp_port_start(pdev, 3) & ~0xf) | 0xe;
 #else
         devmc = pnp_request_card_device(card, pid->devs[2].id, NULL);
@@ -831 +812 @@
 }
 
-static int __devinit snd_opti9xx_probe(struct snd_card *card)
-{
-        static long possible_ports[] = {0x530, 0xe80, 0xf40, 0x604, -1};
+static int snd_opti9xx_probe(struct snd_card *card)
+{
+        static const long possible_ports[] = {0x530, 0xe80, 0xf40, 0x604, -1};
         int error;
         int xdma2;
         struct snd_opti9xx *chip = card->private_data;
         struct snd_wss *codec;
-#ifdef CS4231
-        struct snd_timer *timer;
-#endif
-        struct snd_pcm *pcm;
         struct snd_rawmidi *rmidi;
         struct snd_hwdep *synth;
@@ -872 +849 @@
         if (error < 0)
                 return error;
-#ifdef OPTi93X
         chip->codec = codec;
-#endif
-        error = snd_wss_pcm(codec, 0, &pcm);
+        error = snd_wss_pcm(codec, 0);
         if (error < 0)
                 return error;
@@ -887 +862 @@
 #endif
 #ifdef CS4231
-        error = snd_wss_timer(codec, 0, &timer);
+        error = snd_wss_timer(codec, 0);
         if (error < 0)
                 return error;
@@ -893 +868 @@
 #ifdef OPTi93X
         error = request_irq(irq, snd_opti93x_interrupt,
-                            IRQF_DISABLED, DEV_NAME" - WSS", chip);
+                            0, DEV_NAME" - WSS", chip);
         if (error < 0) {
                 snd_printk(KERN_ERR "opti9xx: can't grab IRQ %d\n", irq);
@@ -900 +875 @@
 #endif
         chip->irq = irq;
+        card->sync_irq = chip->irq;
         strcpy(card->driver, chip->name);
         sprintf(card->shortname, "OPTi %s", card->driver);
 #if defined(CS4231) || defined(OPTi93X)
-        sprintf(card->longname, "%s, %s at 0x%lx, irq %d, dma %d&%d",
-                card->shortname, pcm->name,
-                chip->wss_base + 4, irq, dma1, xdma2);
+        snprintf(card->longname, sizeof(card->longname),
+                 "%s, %s at 0x%lx, irq %d, dma %d&%d",
+                 card->shortname, codec->pcm->name,
+                 chip->wss_base + 4, irq, dma1, xdma2);
 #else
-        sprintf(card->longname, "%s, %s at 0x%lx, irq %d, dma %d",
-                card->shortname, pcm->name, chip->wss_base + 4, irq, dma1);
+        snprintf(card->longname, sizeof(card->longname),
+                 "%s, %s at 0x%lx, irq %d, dma %d",
+                 card->shortname, codec->pcm->name, chip->wss_base + 4, irq,
+                 dma1);
 #endif  /* CS4231 || OPTi93X */
 
@@ -915 +894 @@
         else {
                 error = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401,
-                                mpu_port, 0, mpu_irq, IRQF_DISABLED, &rmidi);
+                                mpu_port, 0, mpu_irq, &rmidi);
                 if (error)
                         snd_printk(KERN_WARNING "no MPU-401 device at 0x%lx?\n",
@@ -954 +933 @@
 }
 
-static int snd_opti9xx_card_new(struct snd_card **cardp)
+static int snd_opti9xx_card_new(struct device *pdev, struct snd_card **cardp)
 {
         struct snd_card *card;
         int err;
 
-        err = snd_card_create(index, id, THIS_MODULE,
-                              sizeof(struct snd_opti9xx), &card);
+        err = snd_card_new(pdev, index, id, THIS_MODULE,
+                           sizeof(struct snd_opti9xx), &card);
         if (err < 0)
                 return err;
@@ -968 +947 @@
 }
 
-static int __devinit snd_opti9xx_isa_match(struct device *devptr,
-                                           unsigned int dev)
+static int snd_opti9xx_isa_match(struct device *devptr,
+                                 unsigned int dev)
 {
 #ifdef CONFIG_PNP
@@ -980 +959 @@
 }
 
-static int __devinit snd_opti9xx_isa_probe(struct device *devptr,
-                                           unsigned int dev)
+static int snd_opti9xx_isa_probe(struct device *devptr,
+                                 unsigned int dev)
 {
         struct snd_card *card;
         int error;
-        static long possible_mpu_ports[] = {0x300, 0x310, 0x320, 0x330, -1};
+        static const long possible_mpu_ports[] = {0x300, 0x310, 0x320, 0x330, -1};
 #ifdef OPTi93X
-        static int possible_irqs[] = {5, 9, 10, 11, 7, -1};
+        static const int possible_irqs[] = {5, 9, 10, 11, 7, -1};
 #else
-        static int possible_irqs[] = {9, 10, 11, 7, -1};
+        static const int possible_irqs[] = {9, 10, 11, 7, -1};
 #endif  /* OPTi93X */
-        static int possible_mpu_irqs[] = {5, 9, 10, 7, -1};
-        static int possible_dma1s[] = {3, 1, 0, -1};
+        static const int possible_mpu_irqs[] = {5, 9, 10, 7, -1};
+        static const int possible_dma1s[] = {3, 1, 0, -1};
 #if defined(CS4231) || defined(OPTi93X)
-        static int possible_dma2s[][2] = {{1,-1}, {0,-1}, {-1,-1}, {0,-1}};
+        static const int possible_dma2s[][2] = {{1,-1}, {0,-1}, {-1,-1}, {0,-1}};
 #endif  /* CS4231 || OPTi93X */
 
@@ -1030 +1009 @@
 #endif
 
-        error = snd_opti9xx_card_new(&card);
+        error = snd_opti9xx_card_new(devptr, &card);
         if (error < 0)
                 return error;
@@ -1038 +1017 @@
                 return error;
         }
-        snd_card_set_dev(card, devptr);
         if ((error = snd_opti9xx_probe(card)) < 0) {
                 snd_card_free(card);
@@ -1047 +1025 @@
 }
 
-static int __devexit snd_opti9xx_isa_remove(struct device *devptr,
-                                            unsigned int dev)
+static int snd_opti9xx_isa_remove(struct device *devptr,
+                                  unsigned int dev)
 {
         snd_card_free(dev_get_drvdata(devptr));
-        dev_set_drvdata(devptr, NULL);
         return 0;
 }
+
+#ifdef CONFIG_PM
+static int snd_opti9xx_suspend(struct snd_card *card)
+{
+        struct snd_opti9xx *chip = card->private_data;
+
+        snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
+        chip->codec->suspend(chip->codec);
+        return 0;
+}
+
+static int snd_opti9xx_resume(struct snd_card *card)
+{
+        struct snd_opti9xx *chip = card->private_data;
+        int error, xdma2;
+#if defined(CS4231) || defined(OPTi93X)
+        xdma2 = dma2;
+#else
+        xdma2 = -1;
+#endif
+
+        error = snd_opti9xx_configure(chip, port, irq, dma1, xdma2,
+                                      mpu_port, mpu_irq);
+        if (error)
+                return error;
+        chip->codec->resume(chip->codec);
+        snd_power_change_state(card, SNDRV_CTL_POWER_D0);
+        return 0;
+}
+
+static int snd_opti9xx_isa_suspend(struct device *dev, unsigned int n,
+                                   pm_message_t state)
+{
+        return snd_opti9xx_suspend(dev_get_drvdata(dev));
+}
+
+static int snd_opti9xx_isa_resume(struct device *dev, unsigned int n)
+{
+        return snd_opti9xx_resume(dev_get_drvdata(dev));
+}
+#endif
 
 static struct isa_driver snd_opti9xx_driver = {
         .match          = snd_opti9xx_isa_match,
         .probe          = snd_opti9xx_isa_probe,
-        .remove         = __devexit_p(snd_opti9xx_isa_remove),
-        /* FIXME: suspend/resume */
+        .remove         = snd_opti9xx_isa_remove,
+#ifdef CONFIG_PM
+        .suspend        = snd_opti9xx_isa_suspend,
+        .resume         = snd_opti9xx_isa_resume,
+#endif
         .driver         = {
                 .name   = DEV_NAME
@@ -1066 +1087 @@
 
 #ifdef CONFIG_PNP
-static int __devinit snd_opti9xx_pnp_probe(struct pnp_card_link *pcard,
-                                           const struct pnp_card_device_id *pid)
+static int snd_opti9xx_pnp_probe(struct pnp_card_link *pcard,
+                                 const struct pnp_card_device_id *pid)
 {
         struct snd_card *card;
@@ -1077 +1098 @@
         if (! isapnp)
                 return -ENODEV;
-        error = snd_opti9xx_card_new(&card);
+        error = snd_opti9xx_card_new(&pcard->card->dev, &card);
         if (error < 0)
                 return error;
@@ -1108 +1129 @@
                 return error;
         }
-        snd_card_set_dev(card, &pcard->card->dev);
         if ((error = snd_opti9xx_probe(card)) < 0) {
                 snd_card_free(card);
@@ -1118 +1138 @@
 }
 
-static void __devexit snd_opti9xx_pnp_remove(struct pnp_card_link * pcard)
+static void snd_opti9xx_pnp_remove(struct pnp_card_link *pcard)
 {
         snd_card_free(pnp_get_card_drvdata(pcard));
@@ -1125 +1145 @@
 }
 
+#ifdef CONFIG_PM
+static int snd_opti9xx_pnp_suspend(struct pnp_card_link *pcard,
+                                   pm_message_t state)
+{
+        return snd_opti9xx_suspend(pnp_get_card_drvdata(pcard));
+}
+
+static int snd_opti9xx_pnp_resume(struct pnp_card_link *pcard)
+{
+        return snd_opti9xx_resume(pnp_get_card_drvdata(pcard));
+}
+#endif
+
 static struct pnp_card_driver opti9xx_pnpc_driver = {
         .flags          = PNP_DRIVER_RES_DISABLE,
-        .name           = "opti9xx",
+        .name           = DEV_NAME,
         .id_table       = snd_opti9xx_pnpids,
         .probe          = snd_opti9xx_pnp_probe,
-        .remove         = __devexit_p(snd_opti9xx_pnp_remove),
+        .remove         = snd_opti9xx_pnp_remove,
+#ifdef CONFIG_PM
+        .suspend        = snd_opti9xx_pnp_suspend,
+        .resume         = snd_opti9xx_pnp_resume,
+#endif
 };
 #endif

GPL/trunk/alsa-kernel/isa/sb/emu8000.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
@@ -5 +6 @@
  *
  *  Routines for control of EMU8000 chip
- *
- *   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
  */
 
 #include <linux/wait.h>
-#include <linux/sched.h>
+#include <linux/sched/signal.h>
 #include <linux/slab.h>
 #include <linux/ioport.h>
+#include <linux/export.h>
 #include <linux/delay.h>
+#include <linux/io.h>
 #include <sound/core.h>
 #include <sound/emu8000.h>
 #include <sound/emu8000_reg.h>
-#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <linux/init.h>
 #include <sound/control.h>
@@ -131 +119 @@
 /*
  */
-static void __devinit
+static void
 snd_emu8000_read_wait(struct snd_emu8000 *emu)
 {
@@ -143 +131 @@
 /*
  */
-static void __devinit
+static void
 snd_emu8000_write_wait(struct snd_emu8000 *emu)
 {
@@ -156 +144 @@
  * detect a card at the given port
  */
-static int __devinit
+static int
 snd_emu8000_detect(struct snd_emu8000 *emu)
 {
@@ -182 +170 @@
  * intiailize audio channels
  */
-static void __devinit
+static void
 init_audio(struct snd_emu8000 *emu)
 {
@@ -223 +211 @@
  * initialize DMA address
  */
-static void __devinit
+static void
 init_dma(struct snd_emu8000 *emu)
 {
@@ -235 +223 @@
  * initialization arrays; from ADIP
  */
-static unsigned short init1[128] /*__devinitdata*/ = {
+static const unsigned short init1[128] = {
         0x03ff, 0x0030,  0x07ff, 0x0130, 0x0bff, 0x0230,  0x0fff, 0x0330,
         0x13ff, 0x0430,  0x17ff, 0x0530, 0x1bff, 0x0630,  0x1fff, 0x0730,
@@ -257 +245 @@
 };
 
-static unsigned short init2[128] /*__devinitdata*/ = {
+static const unsigned short init2[128] = {
         0x03ff, 0x8030, 0x07ff, 0x8130, 0x0bff, 0x8230, 0x0fff, 0x8330,
         0x13ff, 0x8430, 0x17ff, 0x8530, 0x1bff, 0x8630, 0x1fff, 0x8730,
@@ -279 +267 @@
 };
 
-static unsigned short init3[128] /*__devinitdata*/ = {
+static const unsigned short init3[128] = {
         0x0C10, 0x8470, 0x14FE, 0xB488, 0x167F, 0xA470, 0x18E7, 0x84B5,
         0x1B6E, 0x842A, 0x1F1D, 0x852A, 0x0DA3, 0x8F7C, 0x167E, 0xF254,
@@ -301 +289 @@
 };
 
-static unsigned short init4[128] /*__devinitdata*/ = {
+static const unsigned short init4[128] = {
         0x0C10, 0x8470, 0x14FE, 0xB488, 0x167F, 0xA470, 0x18E7, 0x84B5,
         0x1B6E, 0x842A, 0x1F1D, 0x852A, 0x0DA3, 0x0F7C, 0x167E, 0x7254,
@@ -327 +315 @@
  * is meant to work
  */
-static void __devinit
-send_array(struct snd_emu8000 *emu, unsigned short *data, int size)
+static void
+send_array(struct snd_emu8000 *emu, const unsigned short *data, int size)
 {
         int i;
-        unsigned short *p;
+        const unsigned short *p;
 
         p = data;
@@ -349 +337 @@
  * initialisation sequence in the adip.
  */
-static void __devinit
+static void
 init_arrays(struct snd_emu8000 *emu)
 {
@@ -371 +359 @@
 /*
  * Size the onboard memory.
- * This is written so as not to need arbitary delays after the write. It
+ * This is written so as not to need arbitrary delays after the write. It
  * seems that the only way to do this is to use the one channel and keep
  * reallocating between read and write.
  */
-static void __devinit
+static void
 size_dram(struct snd_emu8000 *emu)
 {
-        int i, size, detected_size;
+        int i, size;
 
         if (emu->dram_checked)
@@ -384 +372 @@
 
         size = 0;
-        detected_size = 0;
 
         /* write out a magic number */
@@ -392 +379 @@
         EMU8000_SMLD_WRITE(emu, UNIQUE_ID1);
         snd_emu8000_init_fm(emu); /* This must really be here and not 2 lines back even */
-
-        while (size < EMU8000_MAX_DRAM) {
-
-                size += 512 * 1024;  /* increment 512kbytes */
+        snd_emu8000_write_wait(emu);
+
+        /*
+         * Detect first 512 KiB.  If a write succeeds at the beginning of a
+         * 512 KiB page we assume that the whole page is there.
+         */
+        EMU8000_SMALR_WRITE(emu, EMU8000_DRAM_OFFSET);
+        EMU8000_SMLD_READ(emu); /* discard stale data  */
+        if (EMU8000_SMLD_READ(emu) != UNIQUE_ID1)
+                goto skip_detect;   /* No RAM */
+        snd_emu8000_read_wait(emu);
+
+        for (size = 512 * 1024; size < EMU8000_MAX_DRAM; size += 512 * 1024) {
 
                 /* Write a unique data on the test address.
@@ -417 +413 @@
                 if (EMU8000_SMLD_READ(emu) != UNIQUE_ID2)
                         break; /* no memory at this address */
-
-                detected_size = size;
-
                 snd_emu8000_read_wait(emu);
 
@@ -432 +425 @@
                         break; /* we must have wrapped around */
                 snd_emu8000_read_wait(emu);
-        }
-
+
+                /* Otherwise, it's valid memory. */
+        }
+
+skip_detect:
         /* wait until FULL bit in SMAxW register is false */
         for (i = 0; i < 10000; i++) {
@@ -445 +441 @@
         snd_emu8000_dma_chan(emu, 1, EMU8000_RAM_CLOSE);
 
-        snd_printdd("EMU8000 [0x%lx]: %d Kb on-board memory detected\n",
-                    emu->port1, detected_size/1024);
-
-        emu->mem_size = detected_size;
+        pr_info("EMU8000 [0x%lx]: %d KiB on-board DRAM detected\n",
+                    emu->port1, size/1024);
+
+        emu->mem_size = size;
         emu->dram_checked = 1;
 }
@@ -503 +499 @@
  * The main initialization routine.
  */
-static void __devinit
+static void
 snd_emu8000_init_hw(struct snd_emu8000 *emu)
 {
@@ -553 +549 @@
  *----------------------------------------------------------------*/
 
-static unsigned short bass_parm[12][3] = {
+static const unsigned short bass_parm[12][3] = {
         {0xD26A, 0xD36A, 0x0000}, /* -12 dB */
         {0xD25B, 0xD35B, 0x0000}, /*  -8 */
@@ -568 +564 @@
 };
 
-static unsigned short treble_parm[12][9] = {
+static const unsigned short treble_parm[12][9] = {
         {0x821E, 0xC26A, 0x031E, 0xC36A, 0x021E, 0xD208, 0x831E, 0xD308, 0x0001}, /* -12 dB */
         {0x821E, 0xC25B, 0x031E, 0xC35B, 0x021E, 0xD208, 0x831E, 0xD308, 0x0001},
@@ -860 +856 @@
 }
 
-static struct snd_kcontrol_new mixer_bass_control =
+static const struct snd_kcontrol_new mixer_bass_control =
 {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -870 +866 @@
 };
 
-static struct snd_kcontrol_new mixer_treble_control =
+static const struct snd_kcontrol_new mixer_treble_control =
 {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -927 +923 @@
 }
 
-static struct snd_kcontrol_new mixer_chorus_mode_control =
+static const struct snd_kcontrol_new mixer_chorus_mode_control =
 {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -937 +933 @@
 };
 
-static struct snd_kcontrol_new mixer_reverb_mode_control =
+static const struct snd_kcontrol_new mixer_reverb_mode_control =
 {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -989 +985 @@
 }
 
-static struct snd_kcontrol_new mixer_fm_chorus_depth_control =
+static const struct snd_kcontrol_new mixer_fm_chorus_depth_control =
 {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -999 +995 @@
 };
 
-static struct snd_kcontrol_new mixer_fm_reverb_depth_control =
+static const struct snd_kcontrol_new mixer_fm_reverb_depth_control =
 {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -1010 +1006 @@
 
 
-static struct snd_kcontrol_new *mixer_defs[EMU8000_NUM_CONTROLS] = {
+static const struct snd_kcontrol_new *mixer_defs[EMU8000_NUM_CONTROLS] = {
         &mixer_bass_control,
         &mixer_treble_control,
@@ -1022 +1018 @@
  * create and attach mixer elements for WaveTable treble/bass controls
  */
-static int __devinit
+static int
 snd_emu8000_create_mixer(struct snd_card *card, struct snd_emu8000 *emu)
 {
@@ -1073 +1069 @@
  * initialize and register emu8000 synth device.
  */
-int __devinit
+int
 snd_emu8000_new(struct snd_card *card, int index, long port, int seq_ports,
                 struct snd_seq_device **awe_ret)
@@ -1080 +1076 @@
         struct snd_emu8000 *hw;
         int err;
-        static struct snd_device_ops ops = {
+        static const struct snd_device_ops ops = {
                 .dev_free = snd_emu8000_dev_free,
         };
@@ -1130 +1126 @@
                 return err;
         }
-#if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) && defined(CONFIG_SND_SEQUENCER_MODULE))
+#if IS_ENABLED(CONFIG_SND_SEQUENCER)
         if (snd_seq_device_new(card, index, SNDRV_SEQ_DEV_ID_EMU8000,
                                sizeof(struct snd_emu8000*), &awe) >= 0) {

GPL/trunk/alsa-kernel/isa/sb/emu8000_callback.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  synth callback routines for the emu8000 (AWE32/64)
@@ -4 +5 @@
  *  Copyright (C) 1999 Steve Ratcliffe
  *  Copyright (C) 1999-2000 Takashi Iwai <tiwai@suse.de>
- *
- *   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
  */
 
 #include "emu8000_local.h"
+#include <linux/export.h>
 #include <sound/asoundef.h>
 
@@ -36 +24 @@
 static void sysex(struct snd_emux *emu, char *buf, int len, int parsed,
                   struct snd_midi_channel_set *chset);
-#ifdef CONFIG_SND_SEQUENCER_OSS
+#if IS_ENABLED(CONFIG_SND_SEQUENCER_OSS)
 static int oss_ioctl(struct snd_emux *emu, int cmd, int p1, int p2);
 #endif
@@ -62 +50 @@
  * set up operators
  */
-static struct snd_emux_operators emu8000_ops = {
+static const struct snd_emux_operators emu8000_ops = {
         .owner =        THIS_MODULE,
         .get_voice =    get_voice,
@@ -76 +64 @@
         .load_fx =      load_fx,
         .sysex =        sysex,
-#ifdef CONFIG_SND_SEQUENCER_OSS
+#if IS_ENABLED(CONFIG_SND_SEQUENCER_OSS)
         .oss_ioctl =    oss_ioctl,
 #endif
@@ -175 +163 @@
 
         for (i = 0; i < END; i++) {
-                best[i].time = (unsigned int)(-1); /* XXX MAX_?INT really */;
+                best[i].time = (unsigned int)(-1); /* XXX MAX_?INT really */
                 best[i].voice = -1;
         }
@@ -477 +465 @@
 
 
-#ifdef CONFIG_SND_SEQUENCER_OSS
+#if IS_ENABLED(CONFIG_SND_SEQUENCER_OSS)
 /*
  * OSS ioctl callback

GPL/trunk/alsa-kernel/isa/sb/emu8000_local.h

@@ +1 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 #ifndef __EMU8000_LOCAL_H
 #define __EMU8000_LOCAL_H
@@ -6 +7 @@
  *  Copyright (C) 1999 Steve Ratcliffe
  *  Copyright (C) 1999-2000 Takashi Iwai <tiwai@suse.de>
- *
- *   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
  */
 

GPL/trunk/alsa-kernel/isa/sb/emu8000_patch.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Patch routines for the emu8000 (AWE32/64)
@@ -4 +5 @@
  *  Copyright (C) 1999 Steve Ratcliffe
  *  Copyright (C) 1999-2000 Takashi Iwai <tiwai@suse.de>
- *
- *   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
  */
 
 #include "emu8000_local.h"
-#include <asm/uaccess.h>
+
+#include <linux/sched/signal.h>
+#include <linux/uaccess.h>
 #include <linux/moduleparam.h>
 
@@ -164 +153 @@
 
         /* be sure loop points start < end */
-        if (sp->v.loopstart > sp->v.loopend) {
-                int tmp = sp->v.loopstart;
-                sp->v.loopstart = sp->v.loopend;
-                sp->v.loopend = tmp;
-        }
+        if (sp->v.loopstart > sp->v.loopend)
+                swap(sp->v.loopstart, sp->v.loopend);
 
         /* compute true data size to be loaded */
@@ -185 +171 @@
 
         if (sp->v.mode_flags & SNDRV_SFNT_SAMPLE_8BITS) {
-                if (!access_ok(VERIFY_READ, data, sp->v.size))
+                if (!access_ok(data, sp->v.size))
                         return -EFAULT;
         } else {
-                if (!access_ok(VERIFY_READ, data, sp->v.size * 2))
+                if (!access_ok(data, sp->v.size * 2))
                         return -EFAULT;
         }

GPL/trunk/alsa-kernel/isa/sb/emu8000_synth.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
@@ -5 +6 @@
  *
  *  Emu8000 synth plug-in routine
- *
- *   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
  */
 
 #include "emu8000_local.h"
 #include <linux/init.h>
+#include <linux/module.h>
 #include <sound/initval.h>
 
@@ -34 +22 @@
  * create a new hardware dependent device for Emu8000
  */
-static int snd_emu8000_new_device(struct snd_seq_device *dev)
+static int snd_emu8000_probe(struct device *_dev)
 {
+        struct snd_seq_device *dev = to_seq_dev(_dev);
         struct snd_emu8000 *hw;
         struct snd_emux *emu;
@@ -93 +82 @@
  * free all resources
  */
-static int snd_emu8000_delete_device(struct snd_seq_device *dev)
+static int snd_emu8000_remove(struct device *_dev)
 {
+        struct snd_seq_device *dev = to_seq_dev(_dev);
         struct snd_emu8000 *hw;
 
@@ -103 +93 @@
         if (hw->pcm)
                 snd_device_free(dev->card, hw->pcm);
-        if (hw->emu)
-                snd_emux_free(hw->emu);
-        if (hw->memhdr)
-                snd_util_memhdr_free(hw->memhdr);
+        snd_emux_free(hw->emu);
+        snd_util_memhdr_free(hw->memhdr);
         hw->emu = NULL;
         hw->memhdr = NULL;
@@ -116 +104 @@
  */
 
-static int __init alsa_emu8000_init(void)
-{
-        
-        static struct snd_seq_dev_ops ops = {
-                snd_emu8000_new_device,
-                snd_emu8000_delete_device,
-        };
-        return snd_seq_device_register_driver(SNDRV_SEQ_DEV_ID_EMU8000, &ops,
-                                              sizeof(struct snd_emu8000*));
-}
+static struct snd_seq_driver emu8000_driver = {
+        .driver = {
+                .name = KBUILD_MODNAME,
+                .probe = snd_emu8000_probe,
+                .remove = snd_emu8000_remove,
+        },
+        .id = SNDRV_SEQ_DEV_ID_EMU8000,
+        .argsize = sizeof(struct snd_emu8000 *),
+};
 
-static void __exit alsa_emu8000_exit(void)
-{
-        snd_seq_device_unregister_driver(SNDRV_SEQ_DEV_ID_EMU8000);
-}
-
-module_init(alsa_emu8000_init)
-module_exit(alsa_emu8000_exit)
+module_snd_seq_driver(emu8000_driver);

GPL/trunk/alsa-kernel/isa/sb/sb16.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Driver for SoundBlaster 16/AWE32/AWE64 soundcards
  *  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/err.h>
 #include <linux/isa.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <sound/core.h>
 #include <sound/sb.h>
@@ -63 +48 @@
 #endif
 
-#if defined(SNDRV_SBAWE) && (defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) && defined(CONFIG_SND_SEQUENCER_MODULE)))
+#if defined(SNDRV_SBAWE) && IS_ENABLED(CONFIG_SND_SEQUENCER)
 #define SNDRV_SBAWE_EMU8000
 #endif
@@ -69 +54 @@
 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 */
-#ifdef CONFIG_PNP
-static int isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_ISAPNP; /* Enable this card */
+#ifdef CONFIG_PNP
+static bool isapnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
 #endif
 static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;     /* 0x220,0x240,0x260,0x280 */
@@ -100 +85 @@
 MODULE_PARM_DESC(isapnp, "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 SB16 driver.");
-module_param_array(mpu_port, long, NULL, 0444);
+module_param_hw_array(mpu_port, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(mpu_port, "MPU-401 port # for SB16 driver.");
-module_param_array(fm_port, long, NULL, 0444);
+module_param_hw_array(fm_port, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(fm_port, "FM port # for SB16 PnP driver.");
 #ifdef SNDRV_SBAWE_EMU8000
-module_param_array(awe_port, long, NULL, 0444);
+module_param_hw_array(awe_port, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(awe_port, "AWE port # for SB16 PnP driver.");
 #endif
-module_param_array(irq, int, NULL, 0444);
+module_param_hw_array(irq, int, irq, NULL, 0444);
 MODULE_PARM_DESC(irq, "IRQ # for SB16 driver.");
-module_param_array(dma8, int, NULL, 0444);
+module_param_hw_array(dma8, int, dma, NULL, 0444);
 MODULE_PARM_DESC(dma8, "8-bit DMA # for SB16 driver.");
-module_param_array(dma16, int, NULL, 0444);
+module_param_hw_array(dma16, int, dma, NULL, 0444);
 MODULE_PARM_DESC(dma16, "16-bit DMA # for SB16 driver.");
 module_param_array(mic_agc, int, NULL, 0444);
@@ -146 +131 @@
 #ifdef CONFIG_PNP
 
-static struct pnp_card_device_id snd_sb16_pnpids[] = {
+static const struct pnp_card_device_id snd_sb16_pnpids[] = {
 #ifndef SNDRV_SBAWE
         /* Sound Blaster 16 PnP */
@@ -251 +236 @@
 #ifdef CONFIG_PNP
 
-static int __devinit snd_card_sb16_pnp(int dev, struct snd_card_sb16 *acard,
-                                       struct pnp_card_link *card,
-                                       const struct pnp_card_device_id *id)
+static int snd_card_sb16_pnp(int dev, struct snd_card_sb16 *acard,
+                             struct pnp_card_link *card,
+                             const struct pnp_card_device_id *id)
 {
         struct pnp_dev *pdev;
@@ -324 +309 @@
 #endif
 
-static int snd_sb16_card_new(int dev, struct snd_card **cardp)
+static int snd_sb16_card_new(struct device *devptr, int dev,
+                             struct snd_card **cardp)
 {
         struct snd_card *card;
         int err;
 
-        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
-                              sizeof(struct snd_card_sb16), &card);
+        err = snd_card_new(devptr, index[dev], id[dev], THIS_MODULE,
+                           sizeof(struct snd_card_sb16), &card);
         if (err < 0)
                 return err;
@@ -338 +324 @@
 }
 
-static int __devinit snd_sb16_probe(struct snd_card *card, int dev)
+static int snd_sb16_probe(struct snd_card *card, int dev)
 {
         int xirq, xdma8, xdma16;
@@ -374 +360 @@
                 return err;
 
-        if ((err = snd_sb16dsp_pcm(chip, 0, &chip->pcm)) < 0)
+        if ((err = snd_sb16dsp_pcm(chip, 0)) < 0)
                 return err;
 
@@ -395 +381 @@
         if (chip->mpu_port > 0 && chip->mpu_port != SNDRV_AUTO_PORT) {
                 if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_SB,
-                                               chip->mpu_port, 0,
-                                               xirq, 0, &chip->rmidi)) < 0)
+                                               chip->mpu_port,
+                                               MPU401_INFO_IRQ_HOOK, -1,
+                                               &chip->rmidi)) < 0)
                         return err;
                 chip->rmidi_callback = snd_mpu401_uart_interrupt;
@@ -470 +457 @@
 
         snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
-        snd_pcm_suspend_all(chip->pcm);
         snd_sbmixer_suspend(chip);
         return 0;
@@ -487 +473 @@
 #endif
 
-static int __devinit snd_sb16_isa_probe1(int dev, struct device *pdev)
+static int snd_sb16_isa_probe1(int dev, struct device *pdev)
 {
         struct snd_card_sb16 *acard;
@@ -493 +479 @@
         int err;
 
-        err = snd_sb16_card_new(dev, &card);
+        err = snd_sb16_card_new(pdev, dev, &card);
         if (err < 0)
                 return err;
@@ -507 +493 @@
 #endif
 
-        snd_card_set_dev(card, pdev);
         if ((err = snd_sb16_probe(card, dev)) < 0) {
                 snd_card_free(card);
@@ -517 +502 @@
 
 
-static int __devinit snd_sb16_isa_match(struct device *pdev, unsigned int dev)
+static int snd_sb16_isa_match(struct device *pdev, unsigned int dev)
 {
         return enable[dev] && !is_isapnp_selected(dev);
 }
 
-static int __devinit snd_sb16_isa_probe(struct device *pdev, unsigned int dev)
+static int snd_sb16_isa_probe(struct device *pdev, unsigned int dev)
 {
         int err;
-        static int possible_irqs[] = {5, 9, 10, 7, -1};
-        static int possible_dmas8[] = {1, 3, 0, -1};
-        static int possible_dmas16[] = {5, 6, 7, -1};
+        static const int possible_irqs[] = {5, 9, 10, 7, -1};
+        static const int possible_dmas8[] = {1, 3, 0, -1};
+        static const int possible_dmas16[] = {5, 6, 7, -1};
 
         if (irq[dev] == SNDRV_AUTO_IRQ) {
@@ -551 +536 @@
                 return snd_sb16_isa_probe1(dev, pdev);
         else {
-                static int possible_ports[] = {0x220, 0x240, 0x260, 0x280};
+                static const int possible_ports[] = {0x220, 0x240, 0x260, 0x280};
                 int i;
                 for (i = 0; i < ARRAY_SIZE(possible_ports); i++) {
@@ -563 +548 @@
 }
 
-static int __devexit snd_sb16_isa_remove(struct device *pdev, unsigned int dev)
+static int snd_sb16_isa_remove(struct device *pdev, unsigned int dev)
 {
         snd_card_free(dev_get_drvdata(pdev));
-        dev_set_drvdata(pdev, NULL);
         return 0;
 }
@@ -592 +576 @@
         .match          = snd_sb16_isa_match,
         .probe          = snd_sb16_isa_probe,
-        .remove         = __devexit_p(snd_sb16_isa_remove),
+        .remove         = snd_sb16_isa_remove,
 #ifdef CONFIG_PM
         .suspend        = snd_sb16_isa_suspend,
@@ -604 +588 @@
 
 #ifdef CONFIG_PNP
-static int __devinit snd_sb16_pnp_detect(struct pnp_card_link *pcard,
-                                         const struct pnp_card_device_id *pid)
+static int snd_sb16_pnp_detect(struct pnp_card_link *pcard,
+                               const struct pnp_card_device_id *pid)
 {
         static int dev;
@@ -614 +598 @@
                 if (!enable[dev] || !isapnp[dev])
                         continue;
-                res = snd_sb16_card_new(dev, &card);
+                res = snd_sb16_card_new(&pcard->card->dev, dev, &card);
                 if (res < 0)
                         return res;
-                snd_card_set_dev(card, &pcard->card->dev);
                 if ((res = snd_card_sb16_pnp(dev, card->private_data, pcard, pid)) < 0 ||
                     (res = snd_sb16_probe(card, dev)) < 0) {
@@ -631 +614 @@
 }
 
-static void __devexit snd_sb16_pnp_remove(struct pnp_card_link * pcard)
+static void snd_sb16_pnp_remove(struct pnp_card_link *pcard)
 {
         snd_card_free(pnp_get_card_drvdata(pcard));
@@ -657 +640 @@
         .id_table = snd_sb16_pnpids,
         .probe = snd_sb16_pnp_detect,
-        .remove = __devexit_p(snd_sb16_pnp_remove),
+        .remove = snd_sb16_pnp_remove,
 #ifdef CONFIG_PM
         .suspend = snd_sb16_pnp_suspend,

GPL/trunk/alsa-kernel/isa/sb/sb16_csp.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Copyright (c) 1999 by Uros Bizjak <uros@kss-loka.si>
@@ -6 +7 @@
  *
  *  CSP microcode loader:
- *   alsa-tools/sb16_csp/
- *
- *   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
- *
+ *   alsa-tools/sb16_csp/ 
  */
 
@@ -27 +13 @@
 #include <linux/init.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <sound/core.h>
 #include <sound/control.h>
@@ -61 +48 @@
  */
 struct riff_header {
-        __u32 name;
-        __u32 len;
+        __le32 name;
+        __le32 len;
 };
 
 struct desc_header {
         struct riff_header info;
-        __u16 func_nr;
-        __u16 VOC_type;
-        __u16 flags_play_rec;
-        __u16 flags_16bit_8bit;
-        __u16 flags_stereo_mono;
-        __u16 flags_rates;
+        __le16 func_nr;
+        __le16 VOC_type;
+        __le16 flags_play_rec;
+        __le16 flags_16bit_8bit;
+        __le16 flags_stereo_mono;
+        __le16 flags_rates;
 };
 
@@ -94 +81 @@
 static int snd_sb_csp_unload(struct snd_sb_csp * p);
 static int snd_sb_csp_load_user(struct snd_sb_csp * p, const unsigned char __user *buf, int size, int load_flags);
-static int snd_sb_csp_autoload(struct snd_sb_csp * p, int pcm_sfmt, int play_rec_mode);
+static int snd_sb_csp_autoload(struct snd_sb_csp * p, snd_pcm_format_t pcm_sfmt, int play_rec_mode);
 static int snd_sb_csp_check_version(struct snd_sb_csp * p);
 
@@ -117 +104 @@
 {
         struct snd_sb_csp *p;
-        int uninitialized_var(version);
+        int version;
         int err;
         struct snd_hwdep *hw;
@@ -209 +196 @@
                 /* get information */
         case SNDRV_SB_CSP_IOCTL_INFO:
+                memset(&info, 0, sizeof(info));
                 *info.codec_name = *p->codec_name;
                 info.func_nr = p->func_nr;
@@ -301 +289 @@
 
 /*
- * load microcode via ioctl:
+ * load microcode via ioctl: 
  * code is user-space pointer
  */
@@ -314 +302 @@
 
         struct riff_header file_h, item_h, code_h;
-        __u32 item_type;
+        __le32 item_type;
         struct desc_header funcdesc_h;
 
@@ -326 +314 @@
         if (copy_from_user(&file_h, data_ptr, sizeof(file_h)))
                 return -EFAULT;
-        if ((file_h.name != RIFF_HEADER) ||
+        if ((le32_to_cpu(file_h.name) != RIFF_HEADER) ||
             (le32_to_cpu(file_h.len) >= SNDRV_SB_CSP_MAX_MICROCODE_FILE_SIZE - sizeof(file_h))) {
                 snd_printd("%s: Invalid RIFF header\n", __func__);
@@ -336 +324 @@
         if (copy_from_user(&item_type, data_ptr, sizeof(item_type)))
                 return -EFAULT;
-        if (item_type != CSP__HEADER) {
+        if (le32_to_cpu(item_type) != CSP__HEADER) {
                 snd_printd("%s: Invalid RIFF file type\n", __func__);
                 return -EINVAL;
@@ -346 +334 @@
                         return -EFAULT;
                 data_ptr += sizeof(item_h);
-                if (item_h.name != LIST_HEADER)
+                if (le32_to_cpu(item_h.name) != LIST_HEADER)
                         continue;
 
                 if (copy_from_user(&item_type, data_ptr, sizeof(item_type)))
                          return -EFAULT;
-                switch (item_type) {
+                switch (le32_to_cpu(item_type)) {
                 case FUNC_HEADER:
                         if (copy_from_user(&funcdesc_h, data_ptr + sizeof(item_type), sizeof(funcdesc_h)))
@@ -378 +366 @@
 
                                 /* init microcode blocks */
-                                if (code_h.name != INIT_HEADER)
+                                if (le32_to_cpu(code_h.name) != INIT_HEADER)
                                         break;
                                 data_ptr += sizeof(code_h);
@@ -391 +379 @@
                                 return -EFAULT;
 
-                        if (code_h.name != MAIN_HEADER) {
+                        if (le32_to_cpu(code_h.name) != MAIN_HEADER) {
                                 snd_printd("%s: Missing 'main' microcode\n", __func__);
                                 return -EINVAL;
@@ -683 +671 @@
         return result;
 }
-
+ 
 static int snd_sb_csp_load_user(struct snd_sb_csp * p, const unsigned char __user *buf, int size, int load_flags)
 {
@@ -726 +714 @@
  * return 0 if CSP is loaded and ready to run (p->running != 0)
  */
-static int snd_sb_csp_autoload(struct snd_sb_csp * p, int pcm_sfmt, int play_rec_mode)
+static int snd_sb_csp_autoload(struct snd_sb_csp * p, snd_pcm_format_t pcm_sfmt, int play_rec_mode)
 {
         unsigned long flags;
@@ -732 +720 @@
 
         /* if CSP is running or manually loaded then exit */
-        if (p->running & (SNDRV_SB_CSP_ST_RUNNING | SNDRV_SB_CSP_ST_LOADED))
+        if (p->running & (SNDRV_SB_CSP_ST_RUNNING | SNDRV_SB_CSP_ST_LOADED)) 
                 return -EBUSY;
 
         /* autoload microcode only if requested hardware codec is not already loaded */
-        if (((1 << pcm_sfmt) & p->acc_format) && (play_rec_mode & p->mode)) {
+        if (((1U << (__force int)pcm_sfmt) & p->acc_format) && (play_rec_mode & p->mode)) {
                 p->running = SNDRV_SB_CSP_ST_AUTO;
         } else {
@@ -765 +753 @@
                         }
                         p->acc_format = SNDRV_PCM_FMTBIT_IMA_ADPCM;
-                        break;                          
+                        break;                            
                 default:
                         /* Decouple CSP from IRQ and DMAREQ lines */
@@ -789 +777 @@
                         p->acc_channels = SNDRV_SB_CSP_MONO | SNDRV_SB_CSP_STEREO;
                         p->acc_rates = SNDRV_SB_CSP_RATE_ALL;   /* HW codecs accept all rates */
-                }
+                }   
 
         }
@@ -1029 +1017 @@
 }
 
-static struct snd_kcontrol_new snd_sb_qsound_switch = {
+static const struct snd_kcontrol_new snd_sb_qsound_switch = {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
         .name = "3D Control - Switch",
@@ -1037 +1025 @@
 };
 
-static struct snd_kcontrol_new snd_sb_qsound_space = {
+static const struct snd_kcontrol_new snd_sb_qsound_space = {
         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
         .name = "3D Control - Space",
@@ -1126 +1114 @@
 {
         char name[16];
-        struct snd_info_entry *entry;
+
         sprintf(name, "cspD%d", device);
-        if (! snd_card_proc_new(p->chip->card, name, &entry))
-                snd_info_set_text_ops(entry, p, info_read);
+        snd_card_ro_proc_new(p->chip->card, name, p, info_read);
         return 0;
 }
@@ -1185 +1172 @@
 
 EXPORT_SYMBOL(snd_sb_csp_new);
-
-/*
- * INIT part
- */
-
-static int __init alsa_sb_csp_init(void)
-{
-        return 0;
-}
-
-static void __exit alsa_sb_csp_exit(void)
-{
-}
-
-module_init(alsa_sb_csp_init)
-module_exit(alsa_sb_csp_exit)

GPL/trunk/alsa-kernel/isa/sb/sb16_main.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
@@ -16 +17 @@
  *        to DSP chip (playback) starts. This bug can be avoided with
  *        "16bit DMA Allocation" setting set to Playback or Capture.
- *
- *
- *   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
- *
  */
 
-#include <asm/io.h>
+#include <linux/io.h>
 #include <asm/dma.h>
 #include <linux/init.h>
 #include <linux/time.h>
+#include <linux/module.h>
 #include <sound/core.h>
 #include <sound/sb.h>
@@ -49 +35 @@
 MODULE_LICENSE("GPL");
 
+#define runtime_format_bits(runtime) \
+        ((unsigned int)pcm_format_to_bits((runtime)->format))
+
 #ifdef CONFIG_SND_SB16_CSP
 static void snd_sb16_csp_playback_prepare(struct snd_sb *chip, struct snd_pcm_runtime *runtime)
@@ -58 +47 @@
                         /* manually loaded codec */
                         if ((csp->mode & SNDRV_SB_CSP_MODE_DSP_WRITE) &&
-                            ((1U << runtime->format) == csp->acc_format)) {
+                            (runtime_format_bits(runtime) == csp->acc_format)) {
                                 /* Supported runtime PCM format for playback */
                                 if (csp->ops.csp_use(csp) == 0) {
@@ -66 +55 @@
                         } else if ((csp->mode & SNDRV_SB_CSP_MODE_QSOUND) && (csp->q_enabled)) {
                                 /* QSound decoder is loaded and enabled */
-                                if ((1 << runtime->format) & (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_U8 |
+                                if (runtime_format_bits(runtime) & (SNDRV_PCM_FMTBIT_S8 | SNDRV_PCM_FMTBIT_U8 |
                                                               SNDRV_PCM_FMTBIT_S16_LE | SNDRV_PCM_FMTBIT_U16_LE)) {
                                         /* Only for simple PCM formats */
@@ -106 +95 @@
                         /* manually loaded codec */
                         if ((csp->mode & SNDRV_SB_CSP_MODE_DSP_READ) &&
-                            ((1U << runtime->format) == csp->acc_format)) {
+                            (runtime_format_bits(runtime) == csp->acc_format)) {
                                 /* Supported runtime PCM format for capture */
                                 if (csp->ops.csp_use(csp) == 0) {
@@ -244 +233 @@
 }
 
-static int snd_sb16_hw_params(struct snd_pcm_substream *substream,
-                              struct snd_pcm_hw_params *hw_params)
-{
-        return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
-}
-
-static int snd_sb16_hw_free(struct snd_pcm_substream *substream)
-{
-        snd_pcm_lib_free_pages(substream);
-        return 0;
-}
-
 static int snd_sb16_playback_prepare(struct snd_pcm_substream *substream)
 {
@@ -473 +450 @@
  */
 
-static struct snd_pcm_hardware snd_sb16_playback =
+static const struct snd_pcm_hardware snd_sb16_playback =
 {
         .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
@@ -491 +468 @@
 };
 
-static struct snd_pcm_hardware snd_sb16_capture =
+static const struct snd_pcm_hardware snd_sb16_capture =
 {
         .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
@@ -702 +679 @@
 static int snd_sb16_dma_control_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
-        static char *texts[3] = {
+        static const char * const texts[3] = {
                 "Auto", "Playback", "Capture"
         };
 
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        uinfo->count = 1;
-        uinfo->value.enumerated.items = 3;
-        if (uinfo->value.enumerated.item > 2)
-                uinfo->value.enumerated.item = 2;
-        strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
-        return 0;
+        return snd_ctl_enum_info(uinfo, 1, 3, texts);
 }
 
@@ -743 +714 @@
 }
 
-static struct snd_kcontrol_new snd_sb16_dma_control = {
+static const struct snd_kcontrol_new snd_sb16_dma_control = {
         .iface = SNDRV_CTL_ELEM_IFACE_CARD,
         .name = "16-bit DMA Allocation",
@@ -844 +815 @@
 }
 
-static struct snd_pcm_ops snd_sb16_playback_ops = {
+static const struct snd_pcm_ops snd_sb16_playback_ops = {
         .open =         snd_sb16_playback_open,
         .close =        snd_sb16_playback_close,
-        .ioctl =        snd_pcm_lib_ioctl,
-        .hw_params =    snd_sb16_hw_params,
-        .hw_free =      snd_sb16_hw_free,
         .prepare =      snd_sb16_playback_prepare,
         .trigger =      snd_sb16_playback_trigger,
@@ -855 +823 @@
 };
 
-static struct snd_pcm_ops snd_sb16_capture_ops = {
+static const struct snd_pcm_ops snd_sb16_capture_ops = {
         .open =         snd_sb16_capture_open,
         .close =        snd_sb16_capture_close,
-        .ioctl =        snd_pcm_lib_ioctl,
-        .hw_params =    snd_sb16_hw_params,
-        .hw_free =      snd_sb16_hw_free,
         .prepare =      snd_sb16_capture_prepare,
         .trigger =      snd_sb16_capture_trigger,
@@ -866 +831 @@
 };
 
-int snd_sb16dsp_pcm(struct snd_sb * chip, int device, struct snd_pcm ** rpcm)
+int snd_sb16dsp_pcm(struct snd_sb *chip, int device)
 {
         struct snd_card *card = chip->card;
@@ -872 +837 @@
         int err;
 
-        if (rpcm)
-                *rpcm = NULL;
         if ((err = snd_pcm_new(card, "SB16 DSP", device, 1, 1, &pcm)) < 0)
                 return err;
@@ -879 +842 @@
         pcm->info_flags = SNDRV_PCM_INFO_JOINT_DUPLEX;
         pcm->private_data = chip;
+        chip->pcm = pcm;
 
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &snd_sb16_playback_ops);
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_sb16_capture_ops);
 
-        if (chip->dma16 >= 0 && chip->dma8 != chip->dma16)
-                snd_ctl_add(card, snd_ctl_new1(&snd_sb16_dma_control, chip));
-        else
+        if (chip->dma16 >= 0 && chip->dma8 != chip->dma16) {
+                err = snd_ctl_add(card, snd_ctl_new1(
+                                        &snd_sb16_dma_control, chip));
+                if (err)
+                        return err;
+        } else {
                 pcm->info_flags = SNDRV_PCM_INFO_HALF_DUPLEX;
-
-        snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
-                                              snd_dma_isa_data(),
-                                              64*1024, 128*1024);
-
-        if (rpcm)
-                *rpcm = pcm;
+        }
+
+        snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,
+                                       card->dev, 64*1024, 128*1024);
         return 0;
 }
@@ -907 +871 @@
 EXPORT_SYMBOL(snd_sb16dsp_configure);
 EXPORT_SYMBOL(snd_sb16dsp_interrupt);
-
-/*
- *  INIT part
- */
-
-static int __init alsa_sb16_init(void)
-{
-        return 0;
-}
-
-static void __exit alsa_sb16_exit(void)
-{
-}
-
-module_init(alsa_sb16_init)
-module_exit(alsa_sb16_exit)

GPL/trunk/alsa-kernel/isa/sb/sb8.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Driver for SoundBlaster 1.0/2.0/Pro soundcards and compatible
  *  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
- *
  */
 
@@ -24 +9 @@
 #include <linux/isa.h>
 #include <linux/ioport.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <sound/core.h>
 #include <sound/sb.h>
@@ -37 +22 @@
 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,0x240,0x260 */
 static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ;        /* 5,7,9,10 */
@@ -48 +33 @@
 module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable Sound Blaster soundcard.");
-module_param_array(port, long, NULL, 0444);
+module_param_hw_array(port, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(port, "Port # for SB8 driver.");
-module_param_array(irq, int, NULL, 0444);
+module_param_hw_array(irq, int, irq, NULL, 0444);
 MODULE_PARM_DESC(irq, "IRQ # for SB8 driver.");
-module_param_array(dma8, int, NULL, 0444);
+module_param_hw_array(dma8, int, dma, NULL, 0444);
 MODULE_PARM_DESC(dma8, "8-bit DMA # for SB8 driver.");
 
@@ -80 +65 @@
 }
 
-static int __devinit snd_sb8_match(struct device *pdev, unsigned int dev)
+static int snd_sb8_match(struct device *pdev, unsigned int dev)
 {
         if (!enable[dev])
@@ -95 +80 @@
 }
 
-static int __devinit snd_sb8_probe(struct device *pdev, unsigned int dev)
+static int snd_sb8_probe(struct device *pdev, unsigned int dev)
 {
         struct snd_sb *chip;
@@ -103 +88 @@
         int err;
 
-        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
-                              sizeof(struct snd_sb8), &card);
+        err = snd_card_new(pdev, index[dev], id[dev], THIS_MODULE,
+                           sizeof(struct snd_sb8), &card);
         if (err < 0)
                 return err;
@@ -112 +97 @@
         /* block the 0x388 port to avoid PnP conflicts */
         acard->fm_res = request_region(0x388, 4, "SoundBlaster FM");
+        if (!acard->fm_res) {
+                err = -EBUSY;
+                goto _err;
+        }
 
         if (port[dev] != SNDRV_AUTO_PORT) {
@@ -123 +112 @@
         } else {
                 /* auto-probe legacy ports */
-                static unsigned long possible_ports[] = {
+                static const unsigned long possible_ports[] = {
                         0x220, 0x240, 0x260,
                 };
@@ -158 +147 @@
         }
 
-        if ((err = snd_sb8dsp_pcm(chip, 0, NULL)) < 0)
+        if ((err = snd_sb8dsp_pcm(chip, 0)) < 0)
                 goto _err;
 
@@ -183 +172 @@
         }
 
-        if ((err = snd_sb8dsp_midi(chip, 0, NULL)) < 0)
+        if ((err = snd_sb8dsp_midi(chip, 0)) < 0)
                 goto _err;
 
@@ -193 +182 @@
                 irq[dev], dma8[dev]);
 
-        snd_card_set_dev(card, pdev);
-
         if ((err = snd_card_register(card)) < 0)
                 goto _err;
@@ -206 +193 @@
 }
 
-static int __devexit snd_sb8_remove(struct device *pdev, unsigned int dev)
+static int snd_sb8_remove(struct device *pdev, unsigned int dev)
 {
         snd_card_free(dev_get_drvdata(pdev));
-        dev_set_drvdata(pdev, NULL);
         return 0;
 }
@@ -222 +208 @@
 
         snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
-        snd_pcm_suspend_all(chip->pcm);
         snd_sbmixer_suspend(chip);
         return 0;
@@ -245 +230 @@
         .match          = snd_sb8_match,
         .probe          = snd_sb8_probe,
-        .remove         = __devexit_p(snd_sb8_remove),
+        .remove         = snd_sb8_remove,
 #ifdef CONFIG_PM
         .suspend        = snd_sb8_suspend,
@@ -255 +240 @@
 };
 
-static int __init alsa_card_sb8_init(void)
-{
-        return isa_register_driver(&snd_sb8_driver, SNDRV_CARDS);
-}
-
-static void __exit alsa_card_sb8_exit(void)
-{
-        isa_unregister_driver(&snd_sb8_driver);
-}
-
-module_init(alsa_card_sb8_init)
-module_exit(alsa_card_sb8_exit)
+module_isa_driver(snd_sb8_driver, SNDRV_CARDS);

GPL/trunk/alsa-kernel/isa/sb/sb8_main.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
@@ -5 +6 @@
  *  Routines for control of 8-bit SoundBlaster cards and clones
  *  Please note: I don't have access to old SB8 soundcards.
- *
- *
- *   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
  *
  * --
@@ -31 +17 @@
  */
 
-#include <asm/io.h>
+#include <linux/io.h>
 #include <asm/dma.h>
 #include <linux/init.h>
 #include <linux/time.h>
+#include <linux/module.h>
 #include <sound/core.h>
 #include <sound/sb.h>
@@ -46 +33 @@
 #define SB8_RATE(v)     (SB8_CLOCK / SB8_DEN(v))
 
-static struct snd_ratnum clock = {
+static const struct snd_ratnum clock = {
         .num = SB8_CLOCK,
         .den_min = 1,
@@ -53 +40 @@
 };
 
-static struct snd_pcm_hw_constraint_ratnums hw_constraints_clock = {
+static const struct snd_pcm_hw_constraint_ratnums hw_constraints_clock = {
         .nrats = 1,
         .rats = &clock,
 };
 
-static struct snd_ratnum stereo_clocks[] = {
+static const struct snd_ratnum stereo_clocks[] = {
         {
                 .num = SB8_CLOCK,
@@ -130 +117 @@
                         break;
                 }
-                /* fallthru */
+                fallthrough;
         case SB_HW_201:
                 if (rate > 23000) {
@@ -136 +123 @@
                         break;
                 }
-                /* fallthru */
+                fallthrough;
         case SB_HW_20:
                 chip->playback_format = SB_DSP_LO_OUTPUT_AUTO;
@@ -239 +226 @@
 }
 
-static int snd_sb8_hw_params(struct snd_pcm_substream *substream,
-                             struct snd_pcm_hw_params *hw_params)
-{
-        return snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
-}
-
-static int snd_sb8_hw_free(struct snd_pcm_substream *substream)
-{
-        snd_pcm_lib_free_pages(substream);
-        return 0;
-}
-
 static int snd_sb8_capture_prepare(struct snd_pcm_substream *substream)
 {
@@ -287 +262 @@
                         break;
                 }
-                /* fallthru */
+                fallthrough;
         case SB_HW_20:
                 chip->capture_format = SB_DSP_LO_INPUT_AUTO;
@@ -381 +356 @@
 {
         struct snd_pcm_substream *substream;
-        struct snd_pcm_runtime *runtime;
 
         snd_sb_ack_8bit(chip);
@@ -388 +362 @@
                 if (chip->hardware != SB_HW_JAZZ16)
                         break;
-                /* fallthru */
+                fallthrough;
         case SB_MODE_PLAYBACK_8:
                 substream = chip->playback_substream;
-                runtime = substream->runtime;
                 if (chip->playback_format == SB_DSP_OUTPUT)
                         snd_sb8_playback_trigger(substream, SNDRV_PCM_TRIGGER_START);
@@ -399 +372 @@
                 if (chip->hardware != SB_HW_JAZZ16)
                         break;
-                /* fallthru */
+                fallthrough;
         case SB_MODE_CAPTURE_8:
                 substream = chip->capture_substream;
-                runtime = substream->runtime;
                 if (chip->capture_format == SB_DSP_INPUT)
                         snd_sb8_capture_trigger(substream, SNDRV_PCM_TRIGGER_START);
@@ -447 +419 @@
  */
 
-static struct snd_pcm_hardware snd_sb8_playback =
+static const struct snd_pcm_hardware snd_sb8_playback =
 {
         .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
@@ -466 +438 @@
 };
 
-static struct snd_pcm_hardware snd_sb8_capture =
+static const struct snd_pcm_hardware snd_sb8_capture =
 {
         .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
@@ -572 +544 @@
  */
  
-static struct snd_pcm_ops snd_sb8_playback_ops = {
+static const struct snd_pcm_ops snd_sb8_playback_ops = {
         .open =                 snd_sb8_open,
         .close =                snd_sb8_close,
-        .ioctl =                snd_pcm_lib_ioctl,
-        .hw_params =            snd_sb8_hw_params,
-        .hw_free =              snd_sb8_hw_free,
         .prepare =              snd_sb8_playback_prepare,
         .trigger =              snd_sb8_playback_trigger,
@@ -583 +552 @@
 };
 
-static struct snd_pcm_ops snd_sb8_capture_ops = {
+static const struct snd_pcm_ops snd_sb8_capture_ops = {
         .open =                 snd_sb8_open,
         .close =                snd_sb8_close,
-        .ioctl =                snd_pcm_lib_ioctl,
-        .hw_params =            snd_sb8_hw_params,
-        .hw_free =              snd_sb8_hw_free,
         .prepare =              snd_sb8_capture_prepare,
         .trigger =              snd_sb8_capture_trigger,
@@ -594 +560 @@
 };
 
-int snd_sb8dsp_pcm(struct snd_sb *chip, int device, struct snd_pcm ** rpcm)
+int snd_sb8dsp_pcm(struct snd_sb *chip, int device)
 {
         struct snd_card *card = chip->card;
@@ -601 +567 @@
         size_t max_prealloc = 64 * 1024;
 
-        if (rpcm)
-                *rpcm = NULL;
         if ((err = snd_pcm_new(card, "SB8 DSP", device, 1, 1, &pcm)) < 0)
                 return err;
@@ -614 +578 @@
         if (chip->dma8 > 3 || chip->dma16 >= 0)
                 max_prealloc = 128 * 1024;
-        snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,
-                                              snd_dma_isa_data(),
-                                              64*1024, max_prealloc);
-
-        if (rpcm)
-                *rpcm = pcm;
+        snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,
+                                       card->dev, 64*1024, max_prealloc);
+
         return 0;
 }
@@ -628 +589 @@
 EXPORT_SYMBOL(snd_sb8dsp_midi_interrupt);
 EXPORT_SYMBOL(snd_sb8dsp_midi);
-
-/*
- *  INIT part
- */
-
-static int __init alsa_sb8_init(void)
-{
-        return 0;
-}
-
-static void __exit alsa_sb8_exit(void)
-{
-}
-
-module_init(alsa_sb8_init)
-module_exit(alsa_sb8_exit)

GPL/trunk/alsa-kernel/isa/sb/sb8_midi.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Routines for control of SoundBlaster cards - MIDI interface
- *
- *   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
  *
  * --
@@ -27 +14 @@
  */
 
-#include <asm/io.h>
+#include <linux/io.h>
 #include <linux/time.h>
 #include <sound/core.h>
@@ -139 +126 @@
 
         chip = substream->rmidi->private_data;
+        del_timer_sync(&chip->midi_timer);
         spin_lock_irqsave(&chip->open_lock, flags);
         chip->open &= ~(SB_OPEN_MIDI_OUTPUT | SB_OPEN_MIDI_OUTPUT_TRIGGER);
@@ -210 +198 @@
 }
 
-static void snd_sb8dsp_midi_output_timer(unsigned long data)
-{
-        struct snd_rawmidi_substream *substream = (struct snd_rawmidi_substream *) data;
-        struct snd_sb * chip = substream->rmidi->private_data;
-        unsigned long flags;
-
-        spin_lock_irqsave(&chip->open_lock, flags);
-        chip->midi_timer.expires = 1 + jiffies;
-        add_timer(&chip->midi_timer);
+static void snd_sb8dsp_midi_output_timer(struct timer_list *t)
+{
+        struct snd_sb *chip = from_timer(chip, t, midi_timer);
+        struct snd_rawmidi_substream *substream = chip->midi_substream_output;
+        unsigned long flags;
+
+        spin_lock_irqsave(&chip->open_lock, flags);
+        mod_timer(&chip->midi_timer, 1 + jiffies);
         spin_unlock_irqrestore(&chip->open_lock, flags);        
         snd_sb8dsp_midi_output_write(substream);
@@ -232 +219 @@
         if (up) {
                 if (!(chip->open & SB_OPEN_MIDI_OUTPUT_TRIGGER)) {
-                        init_timer(&chip->midi_timer);
-                        chip->midi_timer.function = snd_sb8dsp_midi_output_timer;
-                        chip->midi_timer.data = (unsigned long) substream;
-                        chip->midi_timer.expires = 1 + jiffies;
-                        add_timer(&chip->midi_timer);
+                        mod_timer(&chip->midi_timer, 1 + jiffies);
                         chip->open |= SB_OPEN_MIDI_OUTPUT_TRIGGER;
                 }
@@ -250 +233 @@
 }
 
-static struct snd_rawmidi_ops snd_sb8dsp_midi_output =
+static const struct snd_rawmidi_ops snd_sb8dsp_midi_output =
 {
         .open =         snd_sb8dsp_midi_output_open,
@@ -257 +240 @@
 };
 
-static struct snd_rawmidi_ops snd_sb8dsp_midi_input =
+static const struct snd_rawmidi_ops snd_sb8dsp_midi_input =
 {
         .open =         snd_sb8dsp_midi_input_open,
@@ -264 +247 @@
 };
 
-int snd_sb8dsp_midi(struct snd_sb *chip, int device, struct snd_rawmidi ** rrawmidi)
+int snd_sb8dsp_midi(struct snd_sb *chip, int device)
 {
         struct snd_rawmidi *rmidi;
         int err;
 
-        if (rrawmidi)
-                *rrawmidi = NULL;
         if ((err = snd_rawmidi_new(chip->card, "SB8 MIDI", device, 1, 1, &rmidi)) < 0)
                 return err;
@@ -280 +261 @@
                 rmidi->info_flags |= SNDRV_RAWMIDI_INFO_DUPLEX;
         rmidi->private_data = chip;
+        timer_setup(&chip->midi_timer, snd_sb8dsp_midi_output_timer, 0);
         chip->rmidi = rmidi;
-        if (rrawmidi)
-                *rrawmidi = rmidi;
-        return 0;
-}
+        return 0;
+}

GPL/trunk/alsa-kernel/isa/sb/sb_common.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
@@ -4 +5 @@
  *
  *  Lowlevel routines for control of Sound Blaster cards
- *
- *   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
- *
  */
 
@@ -26 +12 @@
 #include <linux/slab.h>
 #include <linux/ioport.h>
+#include <linux/module.h>
+#include <linux/io.h>
 #include <sound/core.h>
 #include <sound/sb.h>
 #include <sound/initval.h>
 
-#include <asm/io.h>
 #include <asm/dma.h>
 
@@ -94 +81 @@
 static int snd_sbdsp_version(struct snd_sb * chip)
 {
-        unsigned int result = -ENODEV;
+        unsigned int result;
 
         snd_sbdsp_command(chip, SB_DSP_GET_VERSION);
@@ -184 +171 @@
 static int snd_sbdsp_free(struct snd_sb *chip)
 {
-        if (chip->res_port)
-                release_and_free_resource(chip->res_port);
+        release_and_free_resource(chip->res_port);
         if (chip->irq >= 0)
                 free_irq(chip->irq, (void *) chip);
@@ -219 +205 @@
         struct snd_sb *chip;
         int err;
-        static struct snd_device_ops ops = {
+        static const struct snd_device_ops ops = {
                 .dev_free =     snd_sbdsp_dev_free,
         };
@@ -241 +227 @@
                         (hardware == SB_HW_ALS4000 ||
                          hardware == SB_HW_CS5530) ?
-                        IRQF_SHARED : IRQF_DISABLED,
+                        IRQF_SHARED : 0,
                         "SoundBlaster", (void *) chip)) {
                 snd_printk(KERN_ERR "sb: can't grab irq %d\n", irq);
@@ -248 +234 @@
         }
         chip->irq = irq;
+        card->sync_irq = chip->irq;
 
         if (hardware == SB_HW_ALS4000)
@@ -306 +293 @@
 EXPORT_SYMBOL(snd_sbmixer_resume);
 #endif
-
-/*
- *  INIT part
- */
-
-static int __init alsa_sb_common_init(void)
-{
-        return 0;
-}
-
-static void __exit alsa_sb_common_exit(void)
-{
-}
-
-module_init(alsa_sb_common_init)
-module_exit(alsa_sb_common_exit)

GPL/trunk/alsa-kernel/isa/sb/sb_mixer.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Routines for Sound Blaster mixer control
- *
- *
- *   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
- *
- */
-
-#include <asm/io.h>
+ */
+
+#include <linux/io.h>
 #include <linux/delay.h>
 #include <linux/time.h>
@@ -183 +168 @@
 static int snd_dt019x_input_sw_info(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
-        static const char *texts[5] = {
+        static const char * const texts[5] = {
                 "CD", "Mic", "Line", "Synth", "Master"
         };
 
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        uinfo->count = 1;
-        uinfo->value.enumerated.items = 5;
-        if (uinfo->value.enumerated.item > 4)
-                uinfo->value.enumerated.item = 4;
-        strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
-        return 0;
+        return snd_ctl_enum_info(uinfo, 1, 5, texts);
 }
 
@@ -276 +255 @@
                                              struct snd_ctl_elem_info *uinfo)
 {
-        static const char *texts[3] = {
+        static const char * const texts[3] = {
                 "L chan only", "R chan only", "L ch/2 + R ch/2"
         };
 
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        uinfo->count = 1;
-        uinfo->value.enumerated.items = 3;
-        if (uinfo->value.enumerated.item > 2)
-                uinfo->value.enumerated.item = 2;
-        strcpy(uinfo->value.enumerated.name,
-               texts[uinfo->value.enumerated.item]);
-        return 0;
+        return snd_ctl_enum_info(uinfo, 1, 3, texts);
 }
 
@@ -336 +308 @@
 static int snd_sb8mixer_info_mux(struct snd_kcontrol *kcontrol, struct snd_ctl_elem_info *uinfo)
 {
-        static const char *texts[3] = {
+        static const char * const texts[3] = {
                 "Mic", "CD", "Line"
         };
 
-        uinfo->type = SNDRV_CTL_ELEM_TYPE_ENUMERATED;
-        uinfo->count = 1;
-        uinfo->value.enumerated.items = 3;
-        if (uinfo->value.enumerated.item > 2)
-                uinfo->value.enumerated.item = 2;
-        strcpy(uinfo->value.enumerated.name, texts[uinfo->value.enumerated.item]);
-        return 0;
+        return snd_ctl_enum_info(uinfo, 1, 3, texts);
 }
 
@@ -473 +439 @@
 int snd_sbmixer_add_ctl(struct snd_sb *chip, const char *name, int index, int type, unsigned long value)
 {
-        static struct snd_kcontrol_new newctls[] = {
+        static const struct snd_kcontrol_new newctls[] = {
                 [SB_MIX_SINGLE] = {
                         .iface = SNDRV_CTL_ELEM_IFACE_MIXER,
@@ -529 +495 @@
  */
 
-static struct sbmix_elem snd_sb20_controls[] = {
+static const struct sbmix_elem snd_sb20_controls[] = {
         SB_SINGLE("Master Playback Volume", SB_DSP20_MASTER_DEV, 1, 7),
         SB_SINGLE("PCM Playback Volume", SB_DSP20_PCM_DEV, 1, 3),
@@ -536 +502 @@
 };
 
-static unsigned char snd_sb20_init_values[][2] = {
+static const unsigned char snd_sb20_init_values[][2] = {
         { SB_DSP20_MASTER_DEV, 0 },
         { SB_DSP20_FM_DEV, 0 },
@@ -544 +510 @@
  * SB Pro specific mixer elements
  */
-static struct sbmix_elem snd_sbpro_controls[] = {
+static const struct sbmix_elem snd_sbpro_controls[] = {
         SB_DOUBLE("Master Playback Volume",
                   SB_DSP_MASTER_DEV, SB_DSP_MASTER_DEV, 5, 1, 7),
@@ -564 +530 @@
 };
 
-static unsigned char snd_sbpro_init_values[][2] = {
+static const unsigned char snd_sbpro_init_values[][2] = {
         { SB_DSP_MASTER_DEV, 0 },
         { SB_DSP_PCM_DEV, 0 },
@@ -573 +539 @@
  * SB16 specific mixer elements
  */
-static struct sbmix_elem snd_sb16_controls[] = {
+static const struct sbmix_elem snd_sb16_controls[] = {
         SB_DOUBLE("Master Playback Volume",
                   SB_DSP4_MASTER_DEV, (SB_DSP4_MASTER_DEV + 1), 3, 3, 31),
@@ -611 +577 @@
 };
 
-static unsigned char snd_sb16_init_values[][2] = {
+static const unsigned char snd_sb16_init_values[][2] = {
         { SB_DSP4_MASTER_DEV + 0, 0 },
         { SB_DSP4_MASTER_DEV + 1, 0 },
@@ -627 +593 @@
  * DT019x specific mixer elements
  */
-static struct sbmix_elem snd_dt019x_controls[] = {
+static const struct sbmix_elem snd_dt019x_controls[] = {
         /* ALS4000 below has some parts which we might be lacking,
          * e.g. snd_als4000_ctl_mono_playback_switch - check it! */
@@ -657 +623 @@
 };
 
-static unsigned char snd_dt019x_init_values[][2] = {
+static const unsigned char snd_dt019x_init_values[][2] = {
         { SB_DT019X_MASTER_DEV, 0 },
         { SB_DT019X_PCM_DEV, 0 },
@@ -672 +638 @@
  * ALS4000 specific mixer elements
  */
-static struct sbmix_elem snd_als4000_controls[] = {
+static const struct sbmix_elem snd_als4000_controls[] = {
         SB_DOUBLE("PCM Playback Switch",
                   SB_DT019X_OUTPUT_SW2, SB_DT019X_OUTPUT_SW2, 2, 1, 1),
@@ -706 +672 @@
 };
 
-static unsigned char snd_als4000_init_values[][2] = {
+static const unsigned char snd_als4000_init_values[][2] = {
         { SB_DSP4_MASTER_DEV + 0, 0 },
         { SB_DSP4_MASTER_DEV + 1, 0 },
@@ -724 +690 @@
  */
 static int snd_sbmixer_init(struct snd_sb *chip,
-                            struct sbmix_elem *controls,
+                            const struct sbmix_elem *controls,
                             int controls_count,
-                            unsigned char map[][2],
+                            const unsigned char map[][2],
                             int map_count,
                             char *name)
@@ -819 +785 @@
                 break;
         case SB_HW_DT019X:
-                if ((err = snd_sbmixer_init(chip,
-                                            snd_dt019x_controls,
-                                            ARRAY_SIZE(snd_dt019x_controls),
-                                            snd_dt019x_init_values,
-                                            ARRAY_SIZE(snd_dt019x_init_values),
-                                            "DT019X")) < 0)
+                err = snd_sbmixer_init(chip,
+                                       snd_dt019x_controls,
+                                       ARRAY_SIZE(snd_dt019x_controls),
+                                       snd_dt019x_init_values,
+                                       ARRAY_SIZE(snd_dt019x_init_values),
+                                       "DT019X");
+                if (err < 0)
+                        return err;
                 break;
         default:
@@ -833 +801 @@
 
 #ifdef CONFIG_PM
-static unsigned char sb20_saved_regs[] = {
+static const unsigned char sb20_saved_regs[] = {
         SB_DSP20_MASTER_DEV,
         SB_DSP20_PCM_DEV,
@@ -840 +808 @@
 };
 
-static unsigned char sbpro_saved_regs[] = {
+static const unsigned char sbpro_saved_regs[] = {
         SB_DSP_MASTER_DEV,
         SB_DSP_PCM_DEV,
@@ -852 +820 @@
 };
 
-static unsigned char sb16_saved_regs[] = {
+static const unsigned char sb16_saved_regs[] = {
         SB_DSP4_MASTER_DEV, SB_DSP4_MASTER_DEV + 1,
         SB_DSP4_3DSE,
@@ -870 +838 @@
 };
 
-static unsigned char dt019x_saved_regs[] = {
+static const unsigned char dt019x_saved_regs[] = {
         SB_DT019X_MASTER_DEV,
         SB_DT019X_PCM_DEV,
@@ -883 +851 @@
 };
 
-static unsigned char als4000_saved_regs[] = {
+static const unsigned char als4000_saved_regs[] = {
         /* please verify in dsheet whether regs to be added
            are actually real H/W or just dummy */
@@ -905 +873 @@
 };
 
-static void save_mixer(struct snd_sb *chip, unsigned char *regs, int num_regs)
+static void save_mixer(struct snd_sb *chip, const unsigned char *regs, int num_regs)
 {
         unsigned char *val = chip->saved_regs;
@@ -914 +882 @@
 }
 
-static void restore_mixer(struct snd_sb *chip, unsigned char *regs, int num_regs)
+static void restore_mixer(struct snd_sb *chip, const unsigned char *regs, int num_regs)
 {
         unsigned char *val = chip->saved_regs;

GPL/trunk/alsa-kernel/isa/wavefront/wavefront.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  ALSA card-level driver for Turtle Beach Wavefront cards 
@@ -4 +5 @@
  *
  *  Copyright (c) 1997-1999 by Paul Barton-Davis <pbd@op.net>
- *
- *  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 +12 @@
 #include <linux/isa.h>
 #include <linux/pnp.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <sound/core.h>
 #include <sound/initval.h>
@@ -39 +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 */
 #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 cs4232_pcm_port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT;  /* PnP setup */
@@ -52 +39 @@
 static int dma1[SNDRV_CARDS] = SNDRV_DEFAULT_DMA;           /* 0,1,3,5,6,7 */
 static int dma2[SNDRV_CARDS] = SNDRV_DEFAULT_DMA;           /* 0,1,3,5,6,7 */
-static int use_cs4232_midi[SNDRV_CARDS];
+static bool use_cs4232_midi[SNDRV_CARDS];
 
 module_param_array(index, int, NULL, 0444);
@@ -64 +51 @@
 MODULE_PARM_DESC(isapnp, "ISA PnP detection for WaveFront soundcards.");
 #endif
-module_param_array(cs4232_pcm_port, long, NULL, 0444);
+module_param_hw_array(cs4232_pcm_port, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(cs4232_pcm_port, "Port # for CS4232 PCM interface.");
-module_param_array(cs4232_pcm_irq, int, NULL, 0444);
+module_param_hw_array(cs4232_pcm_irq, int, irq, NULL, 0444);
 MODULE_PARM_DESC(cs4232_pcm_irq, "IRQ # for CS4232 PCM interface.");
-module_param_array(dma1, int, NULL, 0444);
+module_param_hw_array(dma1, int, dma, NULL, 0444);
 MODULE_PARM_DESC(dma1, "DMA1 # for CS4232 PCM interface.");
-module_param_array(dma2, int, NULL, 0444);
+module_param_hw_array(dma2, int, dma, NULL, 0444);
 MODULE_PARM_DESC(dma2, "DMA2 # for CS4232 PCM interface.");
-module_param_array(cs4232_mpu_port, long, NULL, 0444);
+module_param_hw_array(cs4232_mpu_port, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(cs4232_mpu_port, "port # for CS4232 MPU-401 interface.");
-module_param_array(cs4232_mpu_irq, int, NULL, 0444);
+module_param_hw_array(cs4232_mpu_irq, int, irq, NULL, 0444);
 MODULE_PARM_DESC(cs4232_mpu_irq, "IRQ # for CS4232 MPU-401 interface.");
-module_param_array(ics2115_irq, int, NULL, 0444);
+module_param_hw_array(ics2115_irq, int, irq, NULL, 0444);
 MODULE_PARM_DESC(ics2115_irq, "IRQ # for ICS2115.");
-module_param_array(ics2115_port, long, NULL, 0444);
+module_param_hw_array(ics2115_port, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(ics2115_port, "Port # for ICS2115.");
-module_param_array(fm_port, long, NULL, 0444);
+module_param_hw_array(fm_port, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(fm_port, "FM port #.");
 module_param_array(use_cs4232_midi, bool, NULL, 0444);
@@ -89 +76 @@
 static int pnp_registered;
 
-static struct pnp_card_device_id snd_wavefront_pnpids[] = {
+static const struct pnp_card_device_id snd_wavefront_pnpids[] = {
         /* Tropez */
         { .id = "CSC7532", .devs = { { "CSC0000" }, { "CSC0010" }, { "PnPb006" }, { "CSC0004" } } },
@@ -99 +86 @@
 MODULE_DEVICE_TABLE(pnp_card, snd_wavefront_pnpids);
 
-static int __devinit
+static int
 snd_wavefront_pnp (int dev, snd_wavefront_card_t *acard, struct pnp_card_link *card,
                    const struct pnp_card_device_id *id)
@@ -232 +219 @@
 }
 
-static struct snd_hwdep * __devinit
-snd_wavefront_new_synth (struct snd_card *card,
-                         int hw_dev,
-                         snd_wavefront_card_t *acard)
+static struct snd_hwdep *snd_wavefront_new_synth(struct snd_card *card,
+                                                 int hw_dev,
+                                                 snd_wavefront_card_t *acard)
 {
         struct snd_hwdep *wavefront_synth;
@@ -258 +244 @@
 }
 
-static struct snd_hwdep * __devinit
-snd_wavefront_new_fx (struct snd_card *card,
-                      int hw_dev,
-                      snd_wavefront_card_t *acard,
-                      unsigned long port)
+static struct snd_hwdep *snd_wavefront_new_fx(struct snd_card *card,
+                                              int hw_dev,
+                                              snd_wavefront_card_t *acard,
+                                              unsigned long port)
 
 {
@@ -285 +270 @@
 static snd_wavefront_mpu_id external_id = external_mpu;
 
-static struct snd_rawmidi *__devinit
-snd_wavefront_new_midi (struct snd_card *card,
-                        int midi_dev,
-                        snd_wavefront_card_t *acard,
-                        unsigned long port,
-                        snd_wavefront_mpu_id mpu)
+static struct snd_rawmidi *snd_wavefront_new_midi(struct snd_card *card,
+                                                  int midi_dev,
+                                                  snd_wavefront_card_t *acard,
+                                                  unsigned long port,
+                                                  snd_wavefront_mpu_id mpu)
 
 {
@@ -338 +322 @@
 }
 
-static int snd_wavefront_card_new(int dev, struct snd_card **cardp)
+static int snd_wavefront_card_new(struct device *pdev, int dev,
+                                  struct snd_card **cardp)
 {
         struct snd_card *card;
@@ -344 +329 @@
         int err;
 
-        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
-                              sizeof(snd_wavefront_card_t), &card);
+        err = snd_card_new(pdev, index[dev], id[dev], THIS_MODULE,
+                           sizeof(snd_wavefront_card_t), &card);
         if (err < 0)
                 return err;
@@ -362 +347 @@
 }
 
-static int __devinit
+static int
 snd_wavefront_probe (struct snd_card *card, int dev)
 {
@@ -383 +368 @@
         }
 
-        err = snd_wss_pcm(chip, 0, NULL);
+        err = snd_wss_pcm(chip, 0);
         if (err < 0)
                 return err;
 
-        err = snd_wss_timer(chip, 0, NULL);
+        err = snd_wss_timer(chip, 0);
         if (err < 0)
                 return err;
@@ -419 +404 @@
         }
         if (request_irq(ics2115_irq[dev], snd_wavefront_ics2115_interrupt,
-                        IRQF_DISABLED, "ICS2115", acard)) {
+                        0, "ICS2115", acard)) {
                 snd_printk(KERN_ERR "unable to use ICS2115 IRQ %d\n", ics2115_irq[dev]);
                 return -EBUSY;
@@ -425 +410 @@
         
         acard->wavefront.irq = ics2115_irq[dev];
+        card->sync_irq = acard->wavefront.irq;
         acard->wavefront.base = ics2115_port[dev];
 
@@ -450 +436 @@
                 err = snd_mpu401_uart_new(card, midi_dev, MPU401_HW_CS4232,
                                           cs4232_mpu_port[dev], 0,
-                                          cs4232_mpu_irq[dev], IRQF_DISABLED,
-                                          NULL);
+                                          cs4232_mpu_irq[dev], NULL);
                 if (err < 0) {
                         snd_printk (KERN_ERR "can't allocate CS4232 MPU-401 device\n");
@@ -543 +528 @@
 }       
 
-static int __devinit snd_wavefront_isa_match(struct device *pdev,
-                                             unsigned int dev)
+static int snd_wavefront_isa_match(struct device *pdev,
+                                   unsigned int dev)
 {
         if (!enable[dev])
@@ -563 +548 @@
 }
 
-static int __devinit snd_wavefront_isa_probe(struct device *pdev,
-                                             unsigned int dev)
+static int snd_wavefront_isa_probe(struct device *pdev,
+                                   unsigned int dev)
 {
         struct snd_card *card;
         int err;
 
-        err = snd_wavefront_card_new(dev, &card);
+        err = snd_wavefront_card_new(pdev, dev, &card);
         if (err < 0)
                 return err;
-        snd_card_set_dev(card, pdev);
         if ((err = snd_wavefront_probe(card, dev)) < 0) {
                 snd_card_free(card);
@@ -582 +566 @@
 }
 
-static int __devexit snd_wavefront_isa_remove(struct device *devptr,
-                                              unsigned int dev)
+static int snd_wavefront_isa_remove(struct device *devptr,
+                                    unsigned int dev)
 {
         snd_card_free(dev_get_drvdata(devptr));
-        dev_set_drvdata(devptr, NULL);
         return 0;
 }
@@ -595 +578 @@
         .match          = snd_wavefront_isa_match,
         .probe          = snd_wavefront_isa_probe,
-        .remove         = __devexit_p(snd_wavefront_isa_remove),
+        .remove         = snd_wavefront_isa_remove,
         /* FIXME: suspend, resume */
         .driver         = {
@@ -604 +587 @@
 
 #ifdef CONFIG_PNP
-static int __devinit snd_wavefront_pnp_detect(struct pnp_card_link *pcard,
-                                        const struct pnp_card_device_id *pid)
+static int snd_wavefront_pnp_detect(struct pnp_card_link *pcard,
+                                    const struct pnp_card_device_id *pid)
 {
         static int dev;
@@ -618 +601 @@
                 return -ENODEV;
 
-        res = snd_wavefront_card_new(dev, &card);
+        res = snd_wavefront_card_new(&pcard->card->dev, dev, &card);
         if (res < 0)
                 return res;
@@ -629 +612 @@
                 }
         }
-        snd_card_set_dev(card, &pcard->card->dev);
 
         if ((res = snd_wavefront_probe(card, dev)) < 0)
@@ -639 +621 @@
 }
 
-static void __devexit snd_wavefront_pnp_remove(struct pnp_card_link * pcard)
+static void snd_wavefront_pnp_remove(struct pnp_card_link *pcard)
 {
         snd_card_free(pnp_get_card_drvdata(pcard));
@@ -650 +632 @@
         .id_table       = snd_wavefront_pnpids,
         .probe          = snd_wavefront_pnp_detect,
-        .remove         = __devexit_p(snd_wavefront_pnp_remove),
+        .remove         = snd_wavefront_pnp_remove,
         /* FIXME: suspend,resume */
 };

GPL/trunk/alsa-kernel/isa/wavefront/wavefront_fx.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Copyright (c) 1998-2002 by Paul Davis <pbd@op.net>
- *
- *  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
  */
 
-#include <asm/io.h>
+#include <linux/io.h>
 #include <linux/init.h>
 #include <linux/time.h>
 #include <linux/wait.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <linux/firmware.h>
 #include <sound/core.h>
 #include <sound/snd_wavefront.h>
 #include <sound/initval.h>
-#include <proto.h>
 
 /* Control bits for the Load Control Register
@@ -80 +67 @@
                 snd_printk ("FX memset: "
                         "page must be >= 0 and <= 7\n");
-                return -(EINVAL);
+                return -EINVAL;
         }
 
@@ -86 +73 @@
                 snd_printk ("FX memset: "
                         "addr must be >= 0 and <= 7f\n");
-                return -(EINVAL);
+                return -EINVAL;
         }
 
@@ -119 +106 @@
                                     "(0x%x, 0x%x, 0x%lx, %d) incomplete\n",
                                     page, addr, (unsigned long) data, cnt);
-                        return -(EIO);
+                        return -EIO;
                 }
         }
@@ -154 +141 @@
 }
 
-int
+int 
 snd_wavefront_fx_release (struct snd_hwdep *hw, struct file *file)
 
@@ -241 +228 @@
 */
 
-int __devinit
+int
 snd_wavefront_fx_start (snd_wavefront_t *dev)
 {

GPL/trunk/alsa-kernel/isa/wavefront/wavefront_midi.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) by Paul Barton-Davis 1998-1999
- *
- * This file is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)
- * Version 2 (June 1991). See the "COPYING" file distributed with this
- * software for more info.  
  */
 
@@ -48 +45 @@
  */
 
-#include <asm/io.h>
+#include <linux/io.h>
 #include <linux/init.h>
 #include <linux/time.h>
@@ -350 +347 @@
 }
 
-static void snd_wavefront_midi_output_timer(unsigned long data)
-{
-        snd_wavefront_card_t *card = (snd_wavefront_card_t *)data;
-        snd_wavefront_midi_t *midi = &card->wavefront.midi;
+static void snd_wavefront_midi_output_timer(struct timer_list *t)
+{
+        snd_wavefront_midi_t *midi = from_timer(midi, t, timer);
+        snd_wavefront_card_t *card = midi->timer_card;
         unsigned long flags;
         
         spin_lock_irqsave (&midi->virtual, flags);
-        midi->timer.expires = 1 + jiffies;
-        add_timer(&midi->timer);
+        mod_timer(&midi->timer, 1 + jiffies);
         spin_unlock_irqrestore (&midi->virtual, flags);
         snd_wavefront_midi_output_write(card);
@@ -385 +381 @@
                 if ((midi->mode[mpu] & MPU401_MODE_OUTPUT_TRIGGER) == 0) {
                         if (!midi->istimer) {
-                                init_timer(&midi->timer);
-                                midi->timer.function = snd_wavefront_midi_output_timer;
-                                midi->timer.data = (unsigned long) substream->rmidi->card->private_data;
-                                midi->timer.expires = 1 + jiffies;
-                                add_timer(&midi->timer);
+                                timer_setup(&midi->timer,
+                                            snd_wavefront_midi_output_timer,
+                                            0);
+                                mod_timer(&midi->timer, 1 + jiffies);
                         }
                         midi->istimer++;
@@ -482 +477 @@
 }
 
-int __devinit
+int
 snd_wavefront_midi_start (snd_wavefront_card_t *card)
 
@@ -538 +533 @@
 
         /* Turn on Virtual MIDI, but first *always* turn it off,
-           since otherwise consectutive reloads of the driver will
+           since otherwise consecutive reloads of the driver will
            never cause the hardware to generate the initial "internal" or 
            "external" source bytes in the MIDI data stream. This
@@ -562 +557 @@
 }
 
-struct snd_rawmidi_ops snd_wavefront_midi_output =
+const struct snd_rawmidi_ops snd_wavefront_midi_output =
 {
         .open =         snd_wavefront_midi_output_open,
@@ -569 +564 @@
 };
 
-struct snd_rawmidi_ops snd_wavefront_midi_input =
+const struct snd_rawmidi_ops snd_wavefront_midi_input =
 {
         .open =         snd_wavefront_midi_input_open,

GPL/trunk/alsa-kernel/isa/wavefront/wavefront_synth.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-only
 /* Copyright (C) by Paul Barton-Davis 1998-1999
  *
  * Some portions of this file are taken from work that is
  * copyright (C) by Hannu Savolainen 1993-1996
- *
- * This program is distributed under the GNU GENERAL PUBLIC LICENSE (GPL)
- * Version 2 (June 1991). See the "COPYING" file distributed with this software
- * for more info.  
  */
 
@@ -21 +18 @@
  */
 
-#include <asm/io.h>
+#include <linux/io.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
@@ -27 +24 @@
 #include <linux/time.h>
 #include <linux/wait.h>
+#include <linux/sched/signal.h>
 #include <linux/firmware.h>
 #include <linux/moduleparam.h>
 #include <linux/slab.h>
+#include <linux/module.h>
 #include <sound/core.h>
 #include <sound/snd_wavefront.h>
@@ -539 +538 @@
 
                 dst++;
-        };
+        }
         return dst;
 };
@@ -787 +786 @@
                                       header->number);
 
+        if (header->number >= ARRAY_SIZE(dev->patch_status))
+                return -EINVAL;
+
         dev->patch_status[header->number] |= WF_SLOT_FILLED;
 
-        bptr = buf;
         bptr = munge_int32 (header->number, buf, 2);
         munge_buf ((unsigned char *)&header->hdr.p, bptr, WF_PATCH_BYTES);
@@ -795 +796 @@
         if (snd_wavefront_cmd (dev, WFC_DOWNLOAD_PATCH, NULL, buf)) {
                 snd_printk ("download patch failed\n");
-                return -(EIO);
+                return -EIO;
         }
 
@@ -810 +811 @@
         DPRINT (WF_DEBUG_LOAD_PATCH, "downloading program %d\n",
                 header->number);
+
+        if (header->number >= ARRAY_SIZE(dev->prog_status))
+                return -EINVAL;
 
         dev->prog_status[header->number] = WF_SLOT_USED;
@@ -833 +837 @@
         if (snd_wavefront_cmd (dev, WFC_DOWNLOAD_PROGRAM, NULL, buf)) {
                 snd_printk ("download patch failed\n"); 
-                return -(EIO);
+                return -EIO;
         }
 
@@ -900 +904 @@
         }
 
+        if (header->number >= WF_MAX_SAMPLE)
+                return -EINVAL;
+
         if (header->size) {
 
@@ -954 +961 @@
                 snd_printk ("channel selection only "
                             "possible on 16-bit samples");
-                return -(EINVAL);
+                return -EINVAL;
         }
 
@@ -1051 +1058 @@
                 snd_printk ("sample %sdownload refused.\n",
                             header->size ? "" : "header ");
-                return -(EIO);
+                return -EIO;
         }
 
@@ -1077 +1084 @@
                         snd_printk ("download block "
                                     "request refused.\n");
-                        return -(EIO);
+                        return -EIO;
                 }
 
@@ -1137 +1144 @@
                                 snd_printk ("upload sample "
                                             "DMA ack timeout\n");
-                                return -(EIO);
+                                return -EIO;
                         } else {
                                 snd_printk ("upload sample "
                                             "DMA ack error 0x%x\n",
                                             dma_ack);
-                                return -(EIO);
+                                return -EIO;
                         }
                 }
@@ -1167 +1174 @@
                                       header->number,
                                       header->hdr.a.OriginalSample);
-    
+
+        if (header->number >= WF_MAX_SAMPLE)
+                return -EINVAL;
+
         munge_int32 (header->number, &alias_hdr[0], 2);
         munge_int32 (header->hdr.a.OriginalSample, &alias_hdr[2], 2);
@@ -1183 +1193 @@
         if (snd_wavefront_cmd (dev, WFC_DOWNLOAD_SAMPLE_ALIAS, NULL, alias_hdr)) {
                 snd_printk ("download alias failed.\n");
-                return -(EIO);
+                return -EIO;
         }
 
@@ -1198 +1208 @@
         unsigned char *msample_hdr;
 
-        msample_hdr = kmalloc(sizeof(WF_MSAMPLE_BYTES), GFP_KERNEL);
+        if (header->number >= WF_MAX_SAMPLE)
+                return -EINVAL;
+
+        msample_hdr = kmalloc(WF_MSAMPLE_BYTES, GFP_KERNEL);
         if (! msample_hdr)
                 return -ENOMEM;
@@ -1234 +1247 @@
                 snd_printk ("download of multisample failed.\n");
                 kfree(msample_hdr);
-                return -(EIO);
+                return -EIO;
         }
 
@@ -1256 +1269 @@
         if (snd_wavefront_cmd (dev, WFC_UPLOAD_MULTISAMPLE, log_ns, number)) {
                 snd_printk ("upload multisample failed.\n");
-                return -(EIO);
+                return -EIO;
         }
     
@@ -1275 +1288 @@
                         snd_printk ("upload multisample failed "
                                     "during sample loop.\n");
-                        return -(EIO);
+                        return -EIO;
                 }
                 d[0] = val;
@@ -1282 +1295 @@
                         snd_printk ("upload multisample failed "
                                     "during sample loop.\n");
-                        return -(EIO);
+                        return -EIO;
                 }
                 d[1] = val;
@@ -1317 +1330 @@
         if (snd_wavefront_cmd (dev, WFC_DOWNLOAD_EDRUM_PROGRAM, NULL, drumbuf)) {
                 snd_printk ("download drum failed.\n");
-                return -(EIO);
+                return -EIO;
         }
 
@@ -1743 +1756 @@
 */
 
-static int __devinit
+static int
 snd_wavefront_interrupt_bits (int irq)
 
@@ -1771 +1784 @@
 }
 
-static void __devinit
+static void
 wavefront_should_cause_interrupt (snd_wavefront_t *dev, 
                                   int val, int port, unsigned long timeout)
 
 {
-        wait_queue_t wait;
+        wait_queue_entry_t wait;
 
         init_waitqueue_entry(&wait, current);
@@ -1790 +1803 @@
 }
 
-static int __devinit
+static int
 wavefront_reset_to_cleanliness (snd_wavefront_t *dev)
 
@@ -1941 +1954 @@
 }
 
-static int __devinit
+static int
 wavefront_download_firmware (snd_wavefront_t *dev, char *path)
 
@@ -2014 +2027 @@
 
 
-static int __devinit
+static int
 wavefront_do_reset (snd_wavefront_t *dev)
 
@@ -2103 +2116 @@
 }
 
-int __devinit
+int
 snd_wavefront_start (snd_wavefront_t *dev)
 
@@ -2145 +2158 @@
 }
 
-int __devinit
+int
 snd_wavefront_detect (snd_wavefront_card_t *card)