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

GPL/trunk/alsa-kernel/drivers/mpu401/mpu401.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Driver for generic MPU-401 boards (UART mode only)
  *  Copyright (c) by Jaroslav Kysela <perex@perex.cz>
  *  Copyright (c) 2004 by Castet Matthieu <castet.matthieu@free.fr>
- *
- *
- *   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
- *
  */
 
-#ifdef TARGET_OS2
-#include <sound/config.h>
-#endif
 #include <linux/init.h>
 #include <linux/pnp.h>
 #include <linux/err.h>
 #include <linux/platform_device.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <sound/core.h>
 #include <sound/mpu401.h>
@@ -43 +25 @@
 #endif
 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 */
 #ifdef CONFIG_PNP
 #ifndef TARGET_OS2
-static int pnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
+static bool pnp[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
 #else
 static int pnp[SNDRV_CARDS] = {1,1,1,1,1,1,1,1};
@@ -54 +36 @@
 static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ;        /* MPU-401 IRQ */
 #ifndef TARGET_OS2
-static int uart_enter[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
+static bool uart_enter[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};
 #else
 static int uart_enter[SNDRV_CARDS] = {1,1,1,1,1,1,1,1};
@@ -69 +51 @@
 MODULE_PARM_DESC(pnp, "PnP detection for MPU-401 device.");
 #endif
-module_param_array(port, long, NULL, 0444);
+module_param_hw_array(port, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(port, "Port # for MPU-401 device.");
-module_param_array(irq, int, NULL, 0444);
+module_param_hw_array(irq, int, irq, NULL, 0444);
 MODULE_PARM_DESC(irq, "IRQ # for MPU-401 device.");
 module_param_array(uart_enter, bool, NULL, 0444);
@@ -80 +62 @@
 static unsigned int snd_mpu401_devices;
 
-static int snd_mpu401_create(int dev, struct snd_card **rcard)
+static int snd_mpu401_create(struct device *devptr, int dev,
+                             struct snd_card **rcard)
 {
         struct snd_card *card;
@@ -89 +72 @@
 
         *rcard = NULL;
-        err = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+        err = snd_card_new(devptr, index[dev], id[dev], THIS_MODULE,
+                           0, &card);
         if (err < 0)
                 return err;
@@ -102 +86 @@
 
         err = snd_mpu401_uart_new(card, 0, MPU401_HW_MPU401, port[dev], 0,
-                                  irq[dev], irq[dev] >= 0 ? IRQF_DISABLED : 0,
-                                  NULL);
+                                  irq[dev], NULL);
         if (err < 0) {
                 printk(KERN_ERR "MPU401 not detected at 0x%lx\n", port[dev]);
@@ -117 +100 @@
 }
 
-static int __devinit snd_mpu401_probe(struct platform_device *devptr)
+static int snd_mpu401_probe(struct platform_device *devptr)
 {
         int dev = devptr->id;
@@ -131 +114 @@
                 return -EINVAL;
         }
-        err = snd_mpu401_create(dev, &card);
+        err = snd_mpu401_create(&devptr->dev, dev, &card);
         if (err < 0)
                 return err;
-        snd_card_set_dev(card, &devptr->dev);
         if ((err = snd_card_register(card)) < 0) {
                 snd_card_free(card);
@@ -143 +125 @@
 }
 
-static int __devexit snd_mpu401_remove(struct platform_device *devptr)
+static int snd_mpu401_remove(struct platform_device *devptr)
 {
         snd_card_free(platform_get_drvdata(devptr));
-        platform_set_drvdata(devptr, NULL);
         return 0;
 }
@@ -154 +135 @@
 static struct platform_driver snd_mpu401_driver = {
         .probe          = snd_mpu401_probe,
-        .remove         = __devexit_p(snd_mpu401_remove),
+        .remove         = snd_mpu401_remove,
         .driver         = {
-                .name   = SND_MPU401_DRIVER
+                .name   = SND_MPU401_DRIVER,
         },
 };
@@ -165 +146 @@
 #define IO_EXTENT 2
 
-static struct pnp_device_id snd_mpu401_pnpids[] = {
+static const struct pnp_device_id snd_mpu401_pnpids[] = {
         { .id = "PNPb006" },
         { .id = "" }
@@ -172 +153 @@
 MODULE_DEVICE_TABLE(pnp, snd_mpu401_pnpids);
 
-static int __devinit snd_mpu401_pnp(int dev, struct pnp_dev *device,
-                                 const struct pnp_device_id *id)
+static int snd_mpu401_pnp(int dev, struct pnp_dev *device,
+                          const struct pnp_device_id *id)
 {
         if (!pnp_port_valid(device, 0) ||
@@ -198 +179 @@
 }
 
-static int __devinit snd_mpu401_pnp_probe(struct pnp_dev *pnp_dev,
-                                          const struct pnp_device_id *id)
+static int snd_mpu401_pnp_probe(struct pnp_dev *pnp_dev,
+                                const struct pnp_device_id *id)
 {
         static int dev;
@@ -211 +192 @@
                 if (err < 0)
                         return err;
-                err = snd_mpu401_create(dev, &card);
+                err = snd_mpu401_create(&pnp_dev->dev, dev, &card);
                 if (err < 0)
                         return err;
@@ -218 +199 @@
                         return err;
                 }
-                snd_card_set_dev(card, &pnp_dev->dev);
                 pnp_set_drvdata(pnp_dev, card);
                 snd_mpu401_devices++;
@@ -227 +207 @@
 }
 
-static void __devexit snd_mpu401_pnp_remove(struct pnp_dev *dev)
+static void snd_mpu401_pnp_remove(struct pnp_dev *dev)
 {
         struct snd_card *card = (struct snd_card *) pnp_get_drvdata(dev);
@@ -239 +219 @@
         .id_table = snd_mpu401_pnpids,
         .probe = snd_mpu401_pnp_probe,
-        .remove = __devexit_p(snd_mpu401_pnp_remove),
+        .remove = snd_mpu401_pnp_remove,
 };
 #else