Changeset 679 for GPL/trunk/alsa-kernel/pci/als4000.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/pci/als4000.c (modified) (30 diffs)

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

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  card-als4000.c - driver for Avance Logic ALS4000 based soundcards.
@@ -6 +7 @@
  *
  *  Framework borrowed from Massimo Piccioni's card-als100.c.
- *
- *
- *  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
  *
  * NOTES
@@ -66 +52 @@
  */
 
-#include <asm/io.h>
+#include <linux/io.h>
 #include <linux/init.h>
 #include <linux/pci.h>
 #include <linux/gameport.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <linux/dma-mapping.h>
 #include <sound/core.h>
@@ -80 +66 @@
 #include <sound/initval.h>
 
+#ifdef TARGET_OS2
+#define KBUILD_MODNAME "als4000"
+#endif
 MODULE_AUTHOR("Bart Hartgers <bart@etpmod.phys.tue.nl>, Andreas Mohr");
 MODULE_DESCRIPTION("Avance Logic ALS4000");
@@ -85 +74 @@
 MODULE_SUPPORTED_DEVICE("{{Avance Logic,ALS4000}}");
 
-#if defined(CONFIG_GAMEPORT) || (defined(MODULE) && defined(CONFIG_GAMEPORT_MODULE))
+#if IS_REACHABLE(CONFIG_GAMEPORT)
 #define SUPPORT_JOYSTICK 1
 #endif
@@ -91 +80 @@
 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_PNP;      /* Enable this card */
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;     /* Enable this card */
 #ifdef SUPPORT_JOYSTICK
 static int joystick_port[SNDRV_CARDS];
@@ -103 +92 @@
 MODULE_PARM_DESC(enable, "Enable ALS4000 soundcard.");
 #ifdef SUPPORT_JOYSTICK
-module_param_array(joystick_port, int, NULL, 0444);
+module_param_hw_array(joystick_port, int, ioport, NULL, 0444);
 MODULE_PARM_DESC(joystick_port, "Joystick port address for ALS4000 soundcard. (0 = disabled)");
 #endif
@@ -117 +106 @@
 };
 
-static DEFINE_PCI_DEVICE_TABLE(snd_als4000_ids) = {
+static const struct pci_device_id snd_als4000_ids[] = {
         { 0x4005, 0x4000, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, },   /* ALS4000 */
         { 0, }
@@ -369 +358 @@
 #define capture_cmd(chip) (capture_cmd_vals[(chip)->capture_format])
 
-static int snd_als4000_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_als4000_hw_free(struct snd_pcm_substream *substream)
-{
-        snd_pcm_lib_free_pages(substream);
-        return 0;
-}
-
 static int snd_als4000_capture_prepare(struct snd_pcm_substream *substream)
 {
@@ -579 +556 @@
                                         ALS4K_IOB_16_ACK_FOR_CR1E);
 
-        /* printk(KERN_INFO "als4000: irq 0x%04x 0x%04x\n",
+        /* dev_dbg(chip->card->dev, "als4000: irq 0x%04x 0x%04x\n",
                                          pci_irqstatus, sb_irqstatus); */
 
@@ -593 +570 @@
 /*****************************************************************/
 
-static struct snd_pcm_hardware snd_als4000_playback =
+static const struct snd_pcm_hardware snd_als4000_playback =
 {
         .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
@@ -612 +589 @@
 };
 
-static struct snd_pcm_hardware snd_als4000_capture =
+static const struct snd_pcm_hardware snd_als4000_capture =
 {
         .info =                 (SNDRV_PCM_INFO_MMAP | SNDRV_PCM_INFO_INTERLEAVED |
@@ -648 +625 @@
 
         chip->playback_substream = NULL;
-        snd_pcm_lib_free_pages(substream);
         return 0;
 }
@@ -667 +643 @@
 
         chip->capture_substream = NULL;
-        snd_pcm_lib_free_pages(substream);
         return 0;
 }
@@ -673 +648 @@
 /******************************************************************/
 
-static struct snd_pcm_ops snd_als4000_playback_ops = {
+static const struct snd_pcm_ops snd_als4000_playback_ops = {
         .open =         snd_als4000_playback_open,
         .close =        snd_als4000_playback_close,
-        .ioctl =        snd_pcm_lib_ioctl,
-        .hw_params =    snd_als4000_hw_params,
-        .hw_free =      snd_als4000_hw_free,
         .prepare =      snd_als4000_playback_prepare,
         .trigger =      snd_als4000_playback_trigger,
@@ -684 +656 @@
 };
 
-static struct snd_pcm_ops snd_als4000_capture_ops = {
+static const struct snd_pcm_ops snd_als4000_capture_ops = {
         .open =         snd_als4000_capture_open,
         .close =        snd_als4000_capture_close,
-        .ioctl =        snd_pcm_lib_ioctl,
-        .hw_params =    snd_als4000_hw_params,
-        .hw_free =      snd_als4000_hw_free,
         .prepare =      snd_als4000_capture_prepare,
         .trigger =      snd_als4000_capture_trigger,
@@ -695 +664 @@
 };
 
-static int __devinit snd_als4000_pcm(struct snd_sb *chip, int device)
+static int snd_als4000_pcm(struct snd_sb *chip, int device)
 {
         struct snd_pcm *pcm;
@@ -708 +677 @@
         snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_CAPTURE, &snd_als4000_capture_ops);
 
-        snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(chip->pci),
-                                              64*1024, 64*1024);
+        snd_pcm_set_managed_buffer_all(pcm, SNDRV_DMA_TYPE_DEV,
+                                       &chip->pci->dev, 64*1024, 64*1024);
 
         chip->pcm = pcm;
@@ -771 +740 @@
 
 #ifdef SUPPORT_JOYSTICK
-static int __devinit snd_als4000_create_gameport(struct snd_card_als4000 *acard, int dev)
+static int snd_als4000_create_gameport(struct snd_card_als4000 *acard, int dev)
 {
         struct gameport *gp;
@@ -792 +761 @@
 
         if (!r) {
-                printk(KERN_WARNING "als4000: cannot reserve joystick ports\n");
+                dev_warn(&acard->pci->dev, "cannot reserve joystick ports\n");
                 return -EBUSY;
         }
@@ -798 +767 @@
         acard->gameport = gp = gameport_allocate_port();
         if (!gp) {
-                printk(KERN_ERR "als4000: cannot allocate memory for gameport\n");
+                dev_err(&acard->pci->dev, "cannot allocate memory for gameport\n");
                 release_and_free_resource(r);
                 return -ENOMEM;
@@ -848 +817 @@
 }
 
-static int __devinit snd_card_als4000_probe(struct pci_dev *pci,
-                                          const struct pci_device_id *pci_id)
+static int snd_card_als4000_probe(struct pci_dev *pci,
+                                  const struct pci_device_id *pci_id)
 {
         static int dev;
@@ -872 +841 @@
         }
         /* check, if we can restrict PCI DMA transfers to 24 bits */
-        if (pci_set_dma_mask(pci, DMA_BIT_MASK(24)) < 0 ||
-            pci_set_consistent_dma_mask(pci, DMA_BIT_MASK(24)) < 0) {
-                snd_printk(KERN_ERR "architecture does not support 24bit PCI busmaster DMA\n");
+        if (dma_set_mask(&pci->dev, DMA_BIT_MASK(24)) < 0 ||
+            dma_set_coherent_mask(&pci->dev, DMA_BIT_MASK(24)) < 0) {
+                dev_err(&pci->dev, "architecture does not support 24bit PCI busmaster DMA\n");
                 pci_disable_device(pci);
                 return -ENXIO;
@@ -889 +858 @@
         pci_set_master(pci);
         
-        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 
-                              sizeof(*acard) /* private_data: acard */,
-                              &card);
+        err = snd_card_new(&pci->dev, index[dev], id[dev], THIS_MODULE,
+                           sizeof(*acard) /* private_data: acard */,
+                           &card);
         if (err < 0) {
                 pci_release_regions(pci);
@@ -921 +890 @@
         chip->pci = pci;
         chip->alt_port = iobase;
-        snd_card_set_dev(card, &pci->dev);
 
         snd_als4000_configure(chip);
@@ -932 +900 @@
         if ((err = snd_mpu401_uart_new( card, 0, MPU401_HW_ALS4000,
                                         iobase + ALS4K_IOB_30_MIDI_DATA,
-                                        MPU401_INFO_INTEGRATED,
-                                        pci->irq, 0, &chip->rmidi)) < 0) {
-                printk(KERN_ERR "als4000: no MPU-401 device at 0x%lx?\n",
+                                        MPU401_INFO_INTEGRATED |
+                                        MPU401_INFO_IRQ_HOOK,
+                                        -1, &chip->rmidi)) < 0) {
+                dev_err(&pci->dev, "no MPU-401 device at 0x%lx?\n",
                                 iobase + ALS4K_IOB_30_MIDI_DATA);
                 goto out_err;
@@ -955 +924 @@
                                 iobase + ALS4K_IOB_12_ADLIB_ADDR2,
                             OPL3_HW_AUTO, 1, &opl3) < 0) {
-                printk(KERN_ERR "als4000: no OPL device at 0x%lx-0x%lx?\n",
+                dev_err(&pci->dev, "no OPL device at 0x%lx-0x%lx?\n",
                            iobase + ALS4K_IOB_10_ADLIB_ADDR0,
                            iobase + ALS4K_IOB_12_ADLIB_ADDR2);
@@ -981 +950 @@
 }
 
-static void __devexit snd_card_als4000_remove(struct pci_dev *pci)
+static void snd_card_als4000_remove(struct pci_dev *pci)
 {
         snd_card_free(pci_get_drvdata(pci));
-        pci_set_drvdata(pci, NULL);
-}
-
-#ifdef CONFIG_PM
-static int snd_als4000_suspend(struct pci_dev *pci, pm_message_t state)
-{
-        struct snd_card *card = pci_get_drvdata(pci);
+}
+
+#ifdef CONFIG_PM_SLEEP
+static int snd_als4000_suspend(struct device *dev)
+{
+        struct snd_card *card = dev_get_drvdata(dev);
         struct snd_card_als4000 *acard = card->private_data;
         struct snd_sb *chip = acard->chip;
@@ -996 +964 @@
         snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
         
-        snd_pcm_suspend_all(chip->pcm);
         snd_sbmixer_suspend(chip);
-
-        pci_disable_device(pci);
-        pci_save_state(pci);
-        pci_set_power_state(pci, pci_choose_state(pci, state));
         return 0;
 }
 
-static int snd_als4000_resume(struct pci_dev *pci)
-{
-        struct snd_card *card = pci_get_drvdata(pci);
+static int snd_als4000_resume(struct device *dev)
+{
+        struct snd_card *card = dev_get_drvdata(dev);
         struct snd_card_als4000 *acard = card->private_data;
         struct snd_sb *chip = acard->chip;
-
-        pci_set_power_state(pci, PCI_D0);
-        pci_restore_state(pci);
-        if (pci_enable_device(pci) < 0) {
-                printk(KERN_ERR "als4000: pci_enable_device failed, "
-                       "disabling device\n");
-                snd_card_disconnect(card);
-                return -EIO;
-        }
-        pci_set_master(pci);
 
         snd_als4000_configure(chip);
@@ -1033 +986 @@
         return 0;
 }
-#endif /* CONFIG_PM */
-
-
-static struct pci_driver driver = {
-        .name = "ALS4000",
+
+static SIMPLE_DEV_PM_OPS(snd_als4000_pm, snd_als4000_suspend, snd_als4000_resume);
+#define SND_ALS4000_PM_OPS      &snd_als4000_pm
+#else
+#define SND_ALS4000_PM_OPS      NULL
+#endif /* CONFIG_PM_SLEEP */
+
+static struct pci_driver als4000_driver = {
+        .name = KBUILD_MODNAME,
         .id_table = snd_als4000_ids,
         .probe = snd_card_als4000_probe,
-        .remove = __devexit_p(snd_card_als4000_remove),
-#ifdef CONFIG_PM
-        .suspend = snd_als4000_suspend,
-        .resume = snd_als4000_resume,
-#endif
-};
-
-static int __init alsa_card_als4000_init(void)
-{
-        return pci_register_driver(&driver);
-}
-
-static void __exit alsa_card_als4000_exit(void)
-{
-        pci_unregister_driver(&driver);
-}
-
-module_init(alsa_card_als4000_init)
-module_exit(alsa_card_als4000_exit)
+        .remove = snd_card_als4000_remove,
+        .driver = {
+                .pm = SND_ALS4000_PM_OPS,
+        },
+};
+
+module_pci_driver(als4000_driver);