Changeset 679 for GPL/trunk/alsa-kernel/isa/sb/sb8.c

Timestamp:

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

Author:

David Azarewicz

Message:

Merge changes from Paul's uniaud32next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/isa/sb/sb8.c (modified) (16 diffs)

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