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

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

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  The driver for the EMU10K1 (SB Live!) based soundcards
@@ -5 +6 @@
  *  Copyright (c) by James Courtier-Dutton <James@superbug.demon.co.uk>
  *      Added support for Audigy 2 Value.
- *
- *
- *   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 +11 @@
 #include <linux/pci.h>
 #include <linux/time.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <sound/core.h>
 #include <sound/emu10k1.h>
 #include <sound/initval.h>
+
+#ifdef TARGET_OS2
+#define KBUILD_MODNAME "emu10k1"
+#endif
 
 MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
@@ -38 +26 @@
                "{Creative Labs,SB Audigy}}");
 
-#if defined(CONFIG_SND_SEQUENCER) || (defined(MODULE) && defined(CONFIG_SND_SEQUENCER_MODULE))
+#if IS_ENABLED(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER)
 #define ENABLE_SYNTH
 #include <sound/emu10k1_synth.h>
@@ -45 +33 @@
 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 */
 static int extin[SNDRV_CARDS];
 static int extout[SNDRV_CARDS];
@@ -57 +45 @@
 static int max_buffer_size[SNDRV_CARDS] = {128,128,128,128,128,128,128,128};
 #endif
-static int enable_ir[SNDRV_CARDS];
+static bool enable_ir[SNDRV_CARDS];
 static uint subsystem[SNDRV_CARDS]; /* Force card subsystem model */
 #ifndef TARGET_OS2
@@ -90 +78 @@
  * Class 0401: 1102:0008 (rev 00) Subsystem: 1102:1001 -> Audigy2 Value  Model:SB0400
  */
-static DEFINE_PCI_DEVICE_TABLE(snd_emu10k1_ids) = {
+static const struct pci_device_id snd_emu10k1_ids[] = {
         { PCI_VDEVICE(CREATIVE, 0x0002), 0 },   /* EMU10K1 */
         { PCI_VDEVICE(CREATIVE, 0x0004), 1 },   /* Audigy */
@@ -110 +98 @@
 MODULE_DEVICE_TABLE(pci, snd_emu10k1_ids);
 
-static int __devinit snd_card_emu10k1_probe(struct pci_dev *pci,
-                                            const struct pci_device_id *pci_id)
+static int snd_card_emu10k1_probe(struct pci_dev *pci,
+                                  const struct pci_device_id *pci_id)
 {
         static int dev;
@@ -128 +116 @@
         }
 
-        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)
                 return err;
@@ -142 +131 @@
         card->private_data = emu;
         emu->delay_pcm_irq = delay_pcm_irq[dev] & 0x1f;
-        if ((err = snd_emu10k1_pcm(emu, 0, NULL)) < 0)
-                goto error;
-        if ((err = snd_emu10k1_pcm_mic(emu, 1, NULL)) < 0)
-                goto error;
-        if ((err = snd_emu10k1_pcm_efx(emu, 2, NULL)) < 0)
+        if ((err = snd_emu10k1_pcm(emu, 0)) < 0)
+                goto error;
+        if ((err = snd_emu10k1_pcm_mic(emu, 1)) < 0)
+                goto error;
+        if ((err = snd_emu10k1_pcm_efx(emu, 2)) < 0)
                 goto error;
         /* This stores the periods table. */
         if (emu->card_capabilities->ca0151_chip) { /* P16V */   
-                if ((err = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),
-                                               1024, &emu->p16v_buffer)) < 0)
+                err = snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, &pci->dev,
+                                          1024, &emu->p16v_buffer);
+                if (err < 0)
                         goto error;
         }
@@ -161 +151 @@
                 goto error;
 
-        if ((err = snd_emu10k1_pcm_multi(emu, 3, NULL)) < 0)
+        if ((err = snd_emu10k1_pcm_multi(emu, 3)) < 0)
                 goto error;
         if (emu->card_capabilities->ca0151_chip) { /* P16V */
-                if ((err = snd_p16v_pcm(emu, 4, NULL)) < 0)
+                if ((err = snd_p16v_pcm(emu, 4)) < 0)
                         goto error;
         }
@@ -174 +164 @@
                         goto error;
         }
-        if ((err = snd_emu10k1_fx8010_new(emu, 0, NULL)) < 0)
+        if ((err = snd_emu10k1_fx8010_new(emu, 0)) < 0)
                 goto error;
 #ifdef ENABLE_SYNTH
@@ -180 +170 @@
                                sizeof(struct snd_emu10k1_synth_arg), &wave) < 0 ||
             wave == NULL) {
-                snd_printk(KERN_WARNING "can't initialize Emu10k1 wavetable synth\n");
+                dev_warn(emu->card->dev,
+                         "can't initialize Emu10k1 wavetable synth\n");
         } else {
                 struct snd_emu10k1_synth_arg *arg;
@@ -192 +183 @@
 #endif
  
-        strcpy(card->driver, emu->card_capabilities->driver);
-        strcpy(card->shortname, emu->card_capabilities->name);
+        strlcpy(card->driver, emu->card_capabilities->driver,
+                sizeof(card->driver));
+        strlcpy(card->shortname, emu->card_capabilities->name,
+                sizeof(card->shortname));
         snprintf(card->longname, sizeof(card->longname),
                  "%s (rev.%d, serial:0x%x) at 0x%lx, irq %i",
@@ -201 +194 @@
                 goto error;
 
+        if (emu->card_capabilities->emu_model)
+                schedule_delayed_work(&emu->emu1010.firmware_work, 0);
+
         pci_set_drvdata(pci, card);
         dev++;
@@ -210 +206 @@
 }
 
-static void __devexit snd_card_emu10k1_remove(struct pci_dev *pci)
+static void snd_card_emu10k1_remove(struct pci_dev *pci)
 {
         snd_card_free(pci_get_drvdata(pci));
-        pci_set_drvdata(pci, NULL);
-}
-
-
-#ifdef CONFIG_PM
-static int snd_emu10k1_suspend(struct pci_dev *pci, pm_message_t state)
-{
-        struct snd_card *card = pci_get_drvdata(pci);
+}
+
+
+#ifdef CONFIG_PM_SLEEP
+static int snd_emu10k1_suspend(struct device *dev)
+{
+        struct snd_card *card = dev_get_drvdata(dev);
         struct snd_emu10k1 *emu = card->private_data;
 
         snd_power_change_state(card, SNDRV_CTL_POWER_D3hot);
 
-        snd_pcm_suspend_all(emu->pcm);
-        snd_pcm_suspend_all(emu->pcm_mic);
-        snd_pcm_suspend_all(emu->pcm_efx);
-        snd_pcm_suspend_all(emu->pcm_multi);
-        snd_pcm_suspend_all(emu->pcm_p16v);
+        emu->suspend = 1;
+
+        cancel_delayed_work_sync(&emu->emu1010.firmware_work);
 
         snd_ac97_suspend(emu->ac97);
@@ -239 +232 @@
 
         snd_emu10k1_done(emu);
-
-        pci_disable_device(pci);
-        pci_save_state(pci);
-        pci_set_power_state(pci, pci_choose_state(pci, state));
         return 0;
 }
 
-static int snd_emu10k1_resume(struct pci_dev *pci)
-{
-        struct snd_card *card = pci_get_drvdata(pci);
+static int snd_emu10k1_resume(struct device *dev)
+{
+        struct snd_card *card = dev_get_drvdata(dev);
         struct snd_emu10k1 *emu = card->private_data;
-
-        pci_set_power_state(pci, PCI_D0);
-        pci_restore_state(pci);
-        if (pci_enable_device(pci) < 0) {
-                printk(KERN_ERR "emu10k1: pci_enable_device failed, "
-                       "disabling device\n");
-                snd_card_disconnect(card);
-                return -EIO;
-        }
-        pci_set_master(pci);
 
         snd_emu10k1_resume_init(emu);
@@ -269 +248 @@
                 snd_p16v_resume(emu);
 
+        emu->suspend = 0;
+
         snd_power_change_state(card, SNDRV_CTL_POWER_D0);
+
+        if (emu->card_capabilities->emu_model)
+                schedule_delayed_work(&emu->emu1010.firmware_work, 0);
+
         return 0;
 }
-#endif
-
-static struct pci_driver driver = {
-        .name = "EMU10K1_Audigy",
+
+static SIMPLE_DEV_PM_OPS(snd_emu10k1_pm, snd_emu10k1_suspend, snd_emu10k1_resume);
+#define SND_EMU10K1_PM_OPS      &snd_emu10k1_pm
+#else
+#define SND_EMU10K1_PM_OPS      NULL
+#endif /* CONFIG_PM_SLEEP */
+
+static struct pci_driver emu10k1_driver = {
+        .name = KBUILD_MODNAME,
         .id_table = snd_emu10k1_ids,
         .probe = snd_card_emu10k1_probe,
-        .remove = __devexit_p(snd_card_emu10k1_remove),
-#ifdef CONFIG_PM
-        .suspend = snd_emu10k1_suspend,
-        .resume = snd_emu10k1_resume,
-#endif
+        .remove = snd_card_emu10k1_remove,
+        .driver = {
+                .pm = SND_EMU10K1_PM_OPS,
+        },
 };
 
-static int __init alsa_card_emu10k1_init(void)
-{
-        return pci_register_driver(&driver);
-}
-
-static void __exit alsa_card_emu10k1_exit(void)
-{
-        pci_unregister_driver(&driver);
-}
-
-module_init(alsa_card_emu10k1_init)
-module_exit(alsa_card_emu10k1_exit)
+module_pci_driver(emu10k1_driver);