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

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/pci/cs5530.c (modified) (18 diffs)

GPL/trunk/alsa-kernel/pci/cs5530.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * cs5530.c - Initialisation code for Cyrix/NatSemi VSA1 softaudio
@@ -22 +23 @@
  * on the XpressAudio(tm) internals.
  *
- * 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, 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.
- *
  * TO DO:
  *      Investigate whether we can portably support Cognac (5520) in the
@@ -37 +28 @@
  */
 
+#ifdef TARGET_OS2
+#define KBUILD_MODNAME "cs5530"
+#endif
+
 #include <linux/delay.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <linux/pci.h>
 #include <linux/slab.h>
@@ -51 +46 @@
 static int index[SNDRV_CARDS] = SNDRV_DEFAULT_IDX;
 static char *id[SNDRV_CARDS] = SNDRV_DEFAULT_STR;
-static int enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;
+
+module_param_array(index, int, NULL, 0444);
+MODULE_PARM_DESC(index, "Index value for CS5530 Audio driver.");
+module_param_array(id, charp, NULL, 0444);
+MODULE_PARM_DESC(id, "ID string for CS5530 Audio driver.");
+module_param_array(enable, bool, NULL, 0444);
+MODULE_PARM_DESC(enable, "Enable CS5530 Audio driver.");
 
 struct snd_cs5530 {
@@ -60 +62 @@
 };
 
-static DEFINE_PCI_DEVICE_TABLE(snd_cs5530_ids) = {
+static const struct pci_device_id snd_cs5530_ids[] = {
         {PCI_VENDOR_ID_CYRIX, PCI_DEVICE_ID_CYRIX_5530_AUDIO, PCI_ANY_ID,
                                                         PCI_ANY_ID, 0, 0},
@@ -82 +84 @@
 }
 
-static void __devexit snd_cs5530_remove(struct pci_dev *pci)
+static void snd_cs5530_remove(struct pci_dev *pci)
 {
         snd_card_free(pci_get_drvdata(pci));
-        pci_set_drvdata(pci, NULL);
-}
-
-static u8 __devinit snd_cs5530_mixer_read(unsigned long io, u8 reg)
+}
+
+static u8 snd_cs5530_mixer_read(unsigned long io, u8 reg)
 {
         outb(reg, io + 4);
@@ -97 +98 @@
 }
 
-static int __devinit snd_cs5530_create(struct snd_card *card,
-                                       struct pci_dev *pci,
-                                       struct snd_cs5530 **rchip)
+static int snd_cs5530_create(struct snd_card *card,
+                             struct pci_dev *pci,
+                             struct snd_cs5530 **rchip)
 {
         struct snd_cs5530 *chip;
@@ -108 +109 @@
         int err;
 
-        static struct snd_device_ops ops = {
+        static const struct snd_device_ops ops = {
                 .dev_free = snd_cs5530_dev_free,
         };
@@ -136 +137 @@
         mem = pci_ioremap_bar(pci, 0);
         if (mem == NULL) {
-                kfree(chip);
-                pci_disable_device(pci);
+                snd_cs5530_free(chip);
                 return -EBUSY;
         }
@@ -156 +156 @@
 
         if (map & (1<<2))
-                printk(KERN_INFO "CS5530: XpressAudio at 0x%lx\n", sb_base);
-        else {
-                printk(KERN_ERR "Could not find XpressAudio!\n");
+                dev_info(card->dev, "XpressAudio at 0x%lx\n", sb_base);
+        else {
+                dev_err(card->dev, "Could not find XpressAudio!\n");
                 snd_cs5530_free(chip);
                 return -ENODEV;
@@ -164 +164 @@
 
         if (map & (1<<5))
-                printk(KERN_INFO "CS5530: MPU at 0x300\n");
+                dev_info(card->dev, "MPU at 0x300\n");
         else if (map & (1<<6))
-                printk(KERN_INFO "CS5530: MPU at 0x330\n");
+                dev_info(card->dev, "MPU at 0x330\n");
 
         irq = snd_cs5530_mixer_read(sb_base, 0x80) & 0x0F;
@@ -178 +178 @@
                 dma16 = 7;
         else {
-                printk(KERN_ERR "CS5530: No 16bit DMA enabled\n");
+                dev_err(card->dev, "No 16bit DMA enabled\n");
                 snd_cs5530_free(chip);
                 return -ENODEV;
@@ -190 +190 @@
                 dma8 = 3;
         else {
-                printk(KERN_ERR "CS5530: No 8bit DMA enabled\n");
+                dev_err(card->dev, "No 8bit DMA enabled\n");
                 snd_cs5530_free(chip);
                 return -ENODEV;
@@ -204 +204 @@
                 irq = 10;
         else {
-                printk(KERN_ERR "CS5530: SoundBlaster IRQ not set\n");
-                snd_cs5530_free(chip);
-                return -ENODEV;
-        }
-
-        printk(KERN_INFO "CS5530: IRQ: %d DMA8: %d DMA16: %d\n", irq, dma8, 
-                                                                        dma16);
+                dev_err(card->dev, "SoundBlaster IRQ not set\n");
+                snd_cs5530_free(chip);
+                return -ENODEV;
+        }
+
+        dev_info(card->dev, "IRQ: %d DMA8: %d DMA16: %d\n", irq, dma8, dma16);
 
         err = snd_sbdsp_create(card, sb_base, irq, snd_sb16dsp_interrupt, dma8,
                                                 dma16, SB_HW_CS5530, &chip->sb);
         if (err < 0) {
-                printk(KERN_ERR "CS5530: Could not create SoundBlaster\n");
-                snd_cs5530_free(chip);
-                return err;
-        }
-
-        err = snd_sb16dsp_pcm(chip->sb, 0, &chip->sb->pcm);
-        if (err < 0) {
-                printk(KERN_ERR "CS5530: Could not create PCM\n");
+                dev_err(card->dev, "Could not create SoundBlaster\n");
+                snd_cs5530_free(chip);
+                return err;
+        }
+
+        err = snd_sb16dsp_pcm(chip->sb, 0);
+        if (err < 0) {
+                dev_err(card->dev, "Could not create PCM\n");
                 snd_cs5530_free(chip);
                 return err;
@@ -229 +228 @@
         err = snd_sbmixer_new(chip->sb);
         if (err < 0) {
-                printk(KERN_ERR "CS5530: Could not create Mixer\n");
+                dev_err(card->dev, "Could not create Mixer\n");
                 snd_cs5530_free(chip);
                 return err;
@@ -240 +239 @@
         }
 
-        snd_card_set_dev(card, &pci->dev);
         *rchip = chip;
         return 0;
 }
 
-static int __devinit snd_cs5530_probe(struct pci_dev *pci,
-                                        const struct pci_device_id *pci_id)
+static int snd_cs5530_probe(struct pci_dev *pci,
+                            const struct pci_device_id *pci_id)
 {
         static int dev;
@@ -260 +258 @@
         }
 
-        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+        err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,
+                           0, &card);
 
         if (err < 0)
@@ -285 +284 @@
 }
 
-static struct pci_driver driver = {
-        .name = "CS5530_Audio",
+static struct pci_driver cs5530_driver = {
+        .name = KBUILD_MODNAME,
         .id_table = snd_cs5530_ids,
         .probe = snd_cs5530_probe,
-        .remove = __devexit_p(snd_cs5530_remove),
+        .remove = snd_cs5530_remove,
 };
 
-static int __init alsa_card_cs5530_init(void)
-{
-        return pci_register_driver(&driver);
-}
-
-static void __exit alsa_card_cs5530_exit(void)
-{
-        pci_unregister_driver(&driver);
-}
-
-module_init(alsa_card_cs5530_init)
-module_exit(alsa_card_cs5530_exit)
-
+module_pci_driver(cs5530_driver);