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

GPL/trunk/alsa-kernel/drivers/serial-u16550.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *   serial.c
@@ -8 +9 @@
  *   This code is based on the code from ALSA 0.5.9, but heavily rewritten.
  *
- *   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
- *
  * Sat Mar 31 17:27:57 PST 2001 tim.mann@compaq.com 
  *      Added support for the Midiator MS-124T and for the MS-124W in
@@ -37 +24 @@
 #include <linux/slab.h>
 #include <linux/ioport.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
+#include <linux/io.h>
 #include <sound/core.h>
 #include <sound/rawmidi.h>
@@ -44 +32 @@
 #include <linux/serial_reg.h>
 #include <linux/jiffies.h>
-
-#include <asm/io.h>
 
 MODULE_DESCRIPTION("MIDI serial u16550");
@@ -57 +43 @@
 #define SNDRV_SERIAL_GENERIC 4     /* Generic Interface */
 #define SNDRV_SERIAL_MAX_ADAPTOR SNDRV_SERIAL_GENERIC
-static char *adaptor_names[] = {
+static const char * const adaptor_names[] = {
         "Soundcanvas",
         "MS-124T",
@@ -70 +56 @@
 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; /* Enable this card */
+static bool enable[SNDRV_CARDS] = SNDRV_DEFAULT_ENABLE; /* Enable this card */
 static long port[SNDRV_CARDS] = SNDRV_DEFAULT_PORT; /* 0x3f8,0x2f8,0x3e8,0x2e8 */
 static int irq[SNDRV_CARDS] = SNDRV_DEFAULT_IRQ;        /* 3,4,5,7,9,10,11,14,15 */
@@ -78 +64 @@
 static int ins[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 1};  /* 1 to 16 */
 static int adaptor[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = SNDRV_SERIAL_SOUNDCANVAS};
-static int droponfull[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS -1)] = SNDRV_SERIAL_NORMALBUFF };
+static bool droponfull[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS -1)] = SNDRV_SERIAL_NORMALBUFF };
 
 module_param_array(index, int, NULL, 0444);
@@ -86 +72 @@
 module_param_array(enable, bool, NULL, 0444);
 MODULE_PARM_DESC(enable, "Enable UART16550A chip.");
-module_param_array(port, long, NULL, 0444);
+module_param_hw_array(port, long, ioport, NULL, 0444);
 MODULE_PARM_DESC(port, "Port # for UART16550A chip.");
-module_param_array(irq, int, NULL, 0444);
+module_param_hw_array(irq, int, irq, NULL, 0444);
 MODULE_PARM_DESC(irq, "IRQ # for UART16550A chip.");
 module_param_array(speed, int, NULL, 0444);
@@ -175 +161 @@
         if (!uart->timer_running) {
                 /* timer 38600bps * 10bit * 16byte */
-                uart->buffer_timer.expires = jiffies + (HZ+255)/256;
+                mod_timer(&uart->buffer_timer, jiffies + (HZ + 255) / 256);
                 uart->timer_running = 1;
-                add_timer(&uart->buffer_timer);
         }
 }
@@ -312 +297 @@
 
 /* When the polling mode, this function calls snd_uart16550_io_loop. */
-static void snd_uart16550_buffer_timer(unsigned long data)
+static void snd_uart16550_buffer_timer(struct timer_list *t)
 {
         unsigned long flags;
         struct snd_uart16550 *uart;
 
-        uart = (struct snd_uart16550 *)data;
+        uart = from_timer(uart, t, buffer_timer);
         spin_lock_irqsave(&uart->open_lock, flags);
         snd_uart16550_del_timer(uart);
@@ -329 +314 @@
  *  return negative error if not found
  */
-static int __devinit snd_uart16550_detect(struct snd_uart16550 *uart)
+static int snd_uart16550_detect(struct snd_uart16550 *uart)
 {
         unsigned long io_base = uart->base;
@@ -755 +740 @@
 }
 
-static struct snd_rawmidi_ops snd_uart16550_output =
+static const struct snd_rawmidi_ops snd_uart16550_output =
 {
         .open =         snd_uart16550_output_open,
@@ -762 +747 @@
 };
 
-static struct snd_rawmidi_ops snd_uart16550_input =
+static const struct snd_rawmidi_ops snd_uart16550_input =
 {
         .open =         snd_uart16550_input_open,
@@ -784 +769 @@
 }
 
-static int __devinit snd_uart16550_create(struct snd_card *card,
-                                       unsigned long iobase,
-                                       int irq,
-                                       unsigned int speed,
-                                       unsigned int base,
-                                       int adaptor,
-                                       int droponfull,
-                                       struct snd_uart16550 **ruart)
-{
-        static struct snd_device_ops ops = {
+static int snd_uart16550_create(struct snd_card *card,
+                                unsigned long iobase,
+                                int irq,
+                                unsigned int speed,
+                                unsigned int base,
+                                int adaptor,
+                                int droponfull,
+                                struct snd_uart16550 **ruart)
+{
+        static const struct snd_device_ops ops = {
                 .dev_free =     snd_uart16550_dev_free,
         };
@@ -817 +802 @@
         if (irq >= 0 && irq != SNDRV_AUTO_IRQ) {
                 if (request_irq(irq, snd_uart16550_interrupt,
-                                IRQF_DISABLED, "Serial MIDI", uart)) {
+                                0, "Serial MIDI", uart)) {
                         snd_printk(KERN_WARNING
                                    "irq %d busy. Using Polling.\n", irq);
@@ -831 +816 @@
         uart->rstatus = 0;
         memset(uart->prev_status, 0x80, sizeof(unsigned char) * SNDRV_SERIAL_MAX_OUTS);
-        init_timer(&uart->buffer_timer);
-        uart->buffer_timer.function = snd_uart16550_buffer_timer;
-        uart->buffer_timer.data = (unsigned long)uart;
+        timer_setup(&uart->buffer_timer, snd_uart16550_buffer_timer, 0);
         uart->timer_running = 0;
 
@@ -864 +847 @@
 }
 
-static void __devinit snd_uart16550_substreams(struct snd_rawmidi_str *stream)
+static void snd_uart16550_substreams(struct snd_rawmidi_str *stream)
 {
         struct snd_rawmidi_substream *substream;
@@ -873 +856 @@
 }
 
-static int __devinit snd_uart16550_rmidi(struct snd_uart16550 *uart, int device,
-                                      int outs, int ins,
-                                      struct snd_rawmidi **rmidi)
+static int snd_uart16550_rmidi(struct snd_uart16550 *uart, int device,
+                               int outs, int ins,
+                               struct snd_rawmidi **rmidi)
 {
         struct snd_rawmidi *rrawmidi;
@@ -900 +883 @@
 }
 
-static int __devinit snd_serial_probe(struct platform_device *devptr)
+static int snd_serial_probe(struct platform_device *devptr)
 {
         struct snd_card *card;
@@ -943 +926 @@
         }
 
-        err  = snd_card_create(index[dev], id[dev], THIS_MODULE, 0, &card);
+        err  = snd_card_new(&devptr->dev, index[dev], id[dev], THIS_MODULE,
+                            0, &card);
         if (err < 0)
                 return err;
@@ -970 +954 @@
                 uart->irq);
 
-        snd_card_set_dev(card, &devptr->dev);
-
         if ((err = snd_card_register(card)) < 0)
                 goto _err;
@@ -983 +965 @@
 }
 
-static int __devexit snd_serial_remove(struct platform_device *devptr)
+static int snd_serial_remove(struct platform_device *devptr)
 {
         snd_card_free(platform_get_drvdata(devptr));
-        platform_set_drvdata(devptr, NULL);
         return 0;
 }
@@ -994 +975 @@
 static struct platform_driver snd_serial_driver = {
         .probe          = snd_serial_probe,
-        .remove         = __devexit_p( snd_serial_remove),
+        .remove         =  snd_serial_remove,
         .driver         = {
-                .name   = SND_SERIAL_DRIVER
+                .name   = SND_SERIAL_DRIVER,
         },
 };