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

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

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *      MOTU Midi Timepiece ALSA Main routines
@@ -4 +5 @@
  *      mail: michael@tweakoz.com
  *      Thanks to John Galbraith
- *
- *      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
- *
  *
  *      This driver is for the 'Mark Of The Unicorn' (MOTU)
@@ -40 +26 @@
  *      128 'scene' memories, recallable from MIDI program change
  *
- *
  * ChangeLog
  * Jun 11 2001  Takashi Iwai <tiwai@suse.de>
@@ -48 +33 @@
  *        The three global ports, computer, adat and broadcast ports, are created
  *        always after h/w and remote ports.
- *
  */
 
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/module.h>
 #include <linux/err.h>
 #include <linux/platform_device.h>
 #include <linux/ioport.h>
+#include <linux/io.h>
 #include <linux/moduleparam.h>
 #include <sound/core.h>
@@ -62 +48 @@
 #include <linux/delay.h>
 
-#include <asm/io.h>
-
 /*
  *      globals
@@ -87 +71 @@
 module_param(id, charp, 0444);
 MODULE_PARM_DESC(id, "ID string for MotuMTPAV MIDI.");
-module_param(port, long, 0444);
+module_param_hw(port, long, ioport, 0444);
 MODULE_PARM_DESC(port, "Parallel port # for MotuMTPAV MIDI.");
-module_param(irq, int, 0444);
+module_param_hw(irq, int, irq, 0444);
 MODULE_PARM_DESC(irq, "Parallel IRQ # for MotuMTPAV MIDI.");
 module_param(hwports, int, 0444);
@@ -407 +391 @@
  */
 
-static void snd_mtpav_output_timer(unsigned long data)
-{
-        unsigned long flags;
-        struct mtpav *chip = (struct mtpav *)data;
+static void snd_mtpav_output_timer(struct timer_list *t)
+{
+        unsigned long flags;
+        struct mtpav *chip = from_timer(chip, t, timer);
         int p;
 
         spin_lock_irqsave(&chip->spinlock, flags);
         /* reprogram timer */
-        chip->timer.expires = 1 + jiffies;
-        add_timer(&chip->timer);
+        mod_timer(&chip->timer, 1 + jiffies);
         /* process each port */
         for (p = 0; p <= chip->num_ports * 2 + MTPAV_PIDX_BROADCAST; p++) {
@@ -429 +412 @@
 static void snd_mtpav_add_output_timer(struct mtpav *chip)
 {
-        chip->timer.expires = 1 + jiffies;
-        add_timer(&chip->timer);
+        mod_timer(&chip->timer, 1 + jiffies);
 }
 
@@ -584 +566 @@
  * get ISA resources
  */
-static int __devinit snd_mtpav_get_ISA(struct mtpav * mcard)
+static int snd_mtpav_get_ISA(struct mtpav *mcard)
 {
         if ((mcard->res_port = request_region(port, 3, "MotuMTPAV MIDI")) == NULL) {
@@ -591 +573 @@
         }
         mcard->port = port;
-        if (request_irq(irq, snd_mtpav_irqh, IRQF_DISABLED, "MOTU MTPAV", mcard)) {
+        if (request_irq(irq, snd_mtpav_irqh, 0, "MOTU MTPAV", mcard)) {
                 snd_printk(KERN_ERR "MTVAP IRQ %d busy\n", irq);
                 return -EBUSY;
@@ -603 +585 @@
  */
 
-static struct snd_rawmidi_ops snd_mtpav_output = {
+static const struct snd_rawmidi_ops snd_mtpav_output = {
         .open =         snd_mtpav_output_open,
         .close =        snd_mtpav_output_close,
@@ -609 +591 @@
 };
 
-static struct snd_rawmidi_ops snd_mtpav_input = {
+static const struct snd_rawmidi_ops snd_mtpav_input = {
         .open =         snd_mtpav_input_open,
         .close =        snd_mtpav_input_close,
@@ -620 +602 @@
  */
 
-static void __devinit snd_mtpav_set_name(struct mtpav *chip,
-                                      struct snd_rawmidi_substream *substream)
+static void snd_mtpav_set_name(struct mtpav *chip,
+                               struct snd_rawmidi_substream *substream)
 {
         if (substream->number >= 0 && substream->number < chip->num_ports)
@@ -635 +617 @@
 }
 
-static int __devinit snd_mtpav_get_RAWMIDI(struct mtpav *mcard)
+static int snd_mtpav_get_RAWMIDI(struct mtpav *mcard)
 {
         int rval;
@@ -692 +674 @@
 /*
  */
-static int __devinit snd_mtpav_probe(struct platform_device *dev)
+static int snd_mtpav_probe(struct platform_device *dev)
 {
         struct snd_card *card;
@@ -698 +680 @@
         struct mtpav *mtp_card;
 
-        err = snd_card_create(index, id, THIS_MODULE, sizeof(*mtp_card), &card);
+        err = snd_card_new(&dev->dev, index, id, THIS_MODULE,
+                           sizeof(*mtp_card), &card);
         if (err < 0)
                 return err;
@@ -704 +687 @@
         mtp_card = card->private_data;
         spin_lock_init(&mtp_card->spinlock);
-        init_timer(&mtp_card->timer);
         mtp_card->card = card;
         mtp_card->irq = -1;
@@ -710 +692 @@
         mtp_card->inmidistate = 0;
         mtp_card->outmidihwport = 0xffffffff;
-        init_timer(&mtp_card->timer);
-        mtp_card->timer.function = snd_mtpav_output_timer;
-        mtp_card->timer.data = (unsigned long) mtp_card;
+        timer_setup(&mtp_card->timer, snd_mtpav_output_timer, 0);
 
         card->private_free = snd_mtpav_free;
@@ -733 +713 @@
         snd_mtpav_portscan(mtp_card);
 
-        snd_card_set_dev(card, &dev->dev);
         err = snd_card_register(mtp_card->card);
         if (err < 0)
@@ -747 +726 @@
 }
 
-static int __devexit snd_mtpav_remove(struct platform_device *devptr)
+static int snd_mtpav_remove(struct platform_device *devptr)
 {
         snd_card_free(platform_get_drvdata(devptr));
-        platform_set_drvdata(devptr, NULL);
         return 0;
 }
@@ -758 +736 @@
 static struct platform_driver snd_mtpav_driver = {
         .probe          = snd_mtpav_probe,
-        .remove         = __devexit_p(snd_mtpav_remove),
+        .remove         = snd_mtpav_remove,
         .driver         = {
-                .name   = SND_MTPAV_DRIVER
+                .name   = SND_MTPAV_DRIVER,
         },
 };