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

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

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  The driver for the Yamaha's DS1/DS1E cards
  *  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
- *
  */
 
@@ -23 +8 @@
 #include <linux/pci.h>
 #include <linux/time.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <sound/core.h>
-#include <sound/ymfpci.h>
+#include "ymfpci.h"
 #include <sound/mpu401.h>
 #include <sound/opl3.h>
 #include <sound/initval.h>
+
+#ifdef TARGET_OS2
+#define KBUILD_MODNAME "ymfpci"
+#endif
 
 MODULE_AUTHOR("Jaroslav Kysela <perex@perex.cz>");
@@ -42 +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_PNP;      /* Enable this card */
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE_PNP;     /* Enable this card */
 static long fm_port[SNDRV_CARDS];
 static long mpu_port[SNDRV_CARDS];
@@ -48 +37 @@
 static long joystick_port[SNDRV_CARDS];
 #endif
-static int rear_switch[SNDRV_CARDS];
+static bool rear_switch[SNDRV_CARDS];
 
 module_param_array(index, int, NULL, 0444);
@@ -56 +45 @@
 module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable Yamaha DS-1 soundcard.");
-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.");
-module_param_array(fm_port, long, NULL, 0444);
+module_param_hw_array(fm_port, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(fm_port, "FM OPL-3 Port.");
 #ifdef SUPPORT_JOYSTICK
-module_param_array(joystick_port, long, NULL, 0444);
+module_param_hw_array(joystick_port, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(joystick_port, "Joystick port address");
 #endif
@@ -67 +56 @@
 MODULE_PARM_DESC(rear_switch, "Enable shared rear/line-in switch");
 
-static DEFINE_PCI_DEVICE_TABLE(snd_ymfpci_ids) = {
+static const struct pci_device_id snd_ymfpci_ids[] = {
         { PCI_VDEVICE(YAMAHA, 0x0004), 0, },   /* YMF724 */
         { PCI_VDEVICE(YAMAHA, 0x000d), 0, },   /* YMF724F */
@@ -80 +69 @@
 
 #ifdef SUPPORT_JOYSTICK
-static int __devinit snd_ymfpci_create_gameport(struct snd_ymfpci *chip, int dev,
-                                                int legacy_ctrl, int legacy_ctrl2)
+static int snd_ymfpci_create_gameport(struct snd_ymfpci *chip, int dev,
+                                      int legacy_ctrl, int legacy_ctrl2)
 {
         struct gameport *gp;
@@ -107 +96 @@
                         }
                         if (!r) {
-                                printk(KERN_ERR "ymfpci: no gameport ports available\n");
+                                dev_err(chip->card->dev,
+                                        "no gameport ports available\n");
                                 return -EBUSY;
                         }
@@ -117 +107 @@
                 case 0x205: legacy_ctrl2 |= 3 << 6; break;
                 default:
-                        printk(KERN_ERR "ymfpci: invalid joystick port %#x", io_port);
+                        dev_err(chip->card->dev,
+                                "invalid joystick port %#x", io_port);
                         return -EINVAL;
                 }
@@ -123 +114 @@
 
         if (!r && !(r = request_region(io_port, 1, "YMFPCI gameport"))) {
-                printk(KERN_ERR "ymfpci: joystick port %#x is in use.\n", io_port);
+                dev_err(chip->card->dev,
+                        "joystick port %#x is in use.\n", io_port);
                 return -EBUSY;
         }
@@ -129 +121 @@
         chip->gameport = gp = gameport_allocate_port();
         if (!gp) {
-                printk(KERN_ERR "ymfpci: cannot allocate memory for gameport\n");
+                dev_err(chip->card->dev,
+                        "cannot allocate memory for gameport\n");
                 release_and_free_resource(r);
                 return -ENOMEM;
@@ -168 +161 @@
 #endif /* SUPPORT_JOYSTICK */
 
-static int __devinit snd_card_ymfpci_probe(struct pci_dev *pci,
-                                           const struct pci_device_id *pci_id)
+static int snd_card_ymfpci_probe(struct pci_dev *pci,
+                                 const struct pci_device_id *pci_id)
 {
         static int dev;
@@ -188 +181 @@
         }
 
-        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;
@@ -264 +258 @@
                                      old_legacy_ctrl,
                                      &chip)) < 0) {
-                snd_card_free(card);
                 release_and_free_resource(mpu_res);
                 release_and_free_resource(fm_res);
-                return err;
+                goto free_card;
         }
         chip->fm_res = fm_res;
@@ -279 +272 @@
                 chip->reg_area_phys,
                 chip->irq);
-        if ((err = snd_ymfpci_pcm(chip, 0, NULL)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-        if ((err = snd_ymfpci_pcm_spdif(chip, 1, NULL)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-        if ((err = snd_ymfpci_pcm_4ch(chip, 2, NULL)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-        if ((err = snd_ymfpci_pcm2(chip, 3, NULL)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-        if ((err = snd_ymfpci_mixer(chip, rear_switch[dev])) < 0) {
-                snd_card_free(card);
-                return err;
-        }
-        if ((err = snd_ymfpci_timer(chip, 0)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        err = snd_ymfpci_pcm(chip, 0);
+        if (err < 0)
+                goto free_card;
+
+        err = snd_ymfpci_pcm_spdif(chip, 1);
+        if (err < 0)
+                goto free_card;
+
+        err = snd_ymfpci_mixer(chip, rear_switch[dev]);
+        if (err < 0)
+                goto free_card;
+
+        if (chip->ac97->ext_id & AC97_EI_SDAC) {
+                err = snd_ymfpci_pcm_4ch(chip, 2);
+                if (err < 0)
+                        goto free_card;
+
+                err = snd_ymfpci_pcm2(chip, 3);
+                if (err < 0)
+                        goto free_card;
+        }
+        err = snd_ymfpci_timer(chip, 0);
+        if (err < 0)
+                goto free_card;
+
         if (chip->mpu_res) {
                 if ((err = snd_mpu401_uart_new(card, 0, MPU401_HW_YMFPCI,
                                                mpu_port[dev],
-                                               MPU401_INFO_INTEGRATED,
-                                               pci->irq, 0, &chip->rawmidi)) < 0) {
-                        printk(KERN_WARNING "ymfpci: cannot initialize MPU401 at 0x%lx, skipping...\n", mpu_port[dev]);
+                                               MPU401_INFO_INTEGRATED |
+                                               MPU401_INFO_IRQ_HOOK,
+                                               -1, &chip->rawmidi)) < 0) {
+                        dev_warn(card->dev,
+                                 "cannot initialize MPU401 at 0x%lx, skipping...\n",
+                                 mpu_port[dev]);
                         legacy_ctrl &= ~YMFPCI_LEGACY_MIEN; /* disable MPU401 irq */
                         pci_write_config_word(pci, PCIR_DSXG_LEGACY, legacy_ctrl);
@@ -318 +315 @@
                                            fm_port[dev] + 2,
                                            OPL3_HW_OPL3, 1, &opl3)) < 0) {
-                        printk(KERN_WARNING "ymfpci: cannot initialize FM OPL3 at 0x%lx, skipping...\n", fm_port[dev]);
+                        dev_warn(card->dev,
+                                 "cannot initialize FM OPL3 at 0x%lx, skipping...\n",
+                                 fm_port[dev]);
                         legacy_ctrl &= ~YMFPCI_LEGACY_FMEN;
                         pci_write_config_word(pci, PCIR_DSXG_LEGACY, legacy_ctrl);
                 } else if ((err = snd_opl3_hwdep_new(opl3, 0, 1, NULL)) < 0) {
-                        snd_card_free(card);
-                        snd_printk(KERN_ERR "cannot create opl3 hwdep\n");
-                        return err;
+                        dev_err(card->dev, "cannot create opl3 hwdep\n");
+                        goto free_card;
                 }
         }
@@ -330 +328 @@
         snd_ymfpci_create_gameport(chip, dev, legacy_ctrl, legacy_ctrl2);
 
-        if ((err = snd_card_register(card)) < 0) {
-                snd_card_free(card);
-                return err;
-        }
+        err = snd_card_register(card);
+        if (err < 0)
+                goto free_card;
+
         pci_set_drvdata(pci, card);
         dev++;
         return 0;
+
+free_card:
+        snd_card_free(card);
+        return err;
 }
 
-static void __devexit snd_card_ymfpci_remove(struct pci_dev *pci)
+static void snd_card_ymfpci_remove(struct pci_dev *pci)
 {
         snd_card_free(pci_get_drvdata(pci));
-        pci_set_drvdata(pci, NULL);
 }
 
-static struct pci_driver driver = {
-        .name = "Yamaha DS-1 PCI",
+static struct pci_driver ymfpci_driver = {
+        .name = KBUILD_MODNAME,
         .id_table = snd_ymfpci_ids,
         .probe = snd_card_ymfpci_probe,
-        .remove = __devexit_p(snd_card_ymfpci_remove),
-#ifdef CONFIG_PM
-        .suspend = snd_ymfpci_suspend,
-        .resume = snd_ymfpci_resume,
+        .remove = snd_card_ymfpci_remove,
+#ifdef CONFIG_PM_SLEEP
+        .driver = {
+                .pm = &snd_ymfpci_pm,
+        },
 #endif
 };
 
-static int __init alsa_card_ymfpci_init(void)
-{
-        return pci_register_driver(&driver);
-}
-
-static void __exit alsa_card_ymfpci_exit(void)
-{
-        pci_unregister_driver(&driver);
-}
-
-module_init(alsa_card_ymfpci_init)
-module_exit(alsa_card_ymfpci_exit)
+module_pci_driver(ymfpci_driver);