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

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

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Dummy soundcard for virtual rawmidi devices
  *
  *  Copyright (c) 2000 by Takashi Iwai <tiwai@suse.de>
- *
- *   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
- *
  */
 
@@ -46 +32 @@
 #include <linux/err.h>
 #include <linux/platform_device.h>
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <sound/core.h>
 #include <sound/seq_kernel.h>
@@ -64 +50 @@
 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] = {1, [1 ... (SNDRV_CARDS - 1)] = 0};
+static bool enable[SNDRV_CARDS] = {1, [1 ... (SNDRV_CARDS - 1)] = 0};
 static int midi_devs[SNDRV_CARDS] = {[0 ... (SNDRV_CARDS - 1)] = 4};
 
@@ -84 +70 @@
 
 
-static int __devinit snd_virmidi_probe(struct platform_device *devptr)
+static int snd_virmidi_probe(struct platform_device *devptr)
 {
         struct snd_card *card;
@@ -91 +77 @@
         int dev = devptr->id;
 
-        err = snd_card_create(index[dev], id[dev], THIS_MODULE,
-                              sizeof(struct snd_card_virmidi), &card);
+        err = snd_card_new(&devptr->dev, index[dev], id[dev], THIS_MODULE,
+                           sizeof(struct snd_card_virmidi), &card);
         if (err < 0)
                 return err;
@@ -100 +86 @@
         if (midi_devs[dev] > MAX_MIDI_DEVICES) {
                 snd_printk(KERN_WARNING
-                           "too much midi devices for virmidi %d: "
-                           "force to use %d\n", dev, MAX_MIDI_DEVICES);
+                           "too much midi devices for virmidi %d: force to use %d\n",
+                           dev, MAX_MIDI_DEVICES);
                 midi_devs[dev] = MAX_MIDI_DEVICES;
         }
@@ -107 +93 @@
                 struct snd_rawmidi *rmidi;
                 struct snd_virmidi_dev *rdev;
-                if ((err = snd_virmidi_new(card, idx, &rmidi)) < 0)
+
+                err = snd_virmidi_new(card, idx, &rmidi);
+                if (err < 0)
                         goto __nodev;
                 rdev = rmidi->private_data;
@@ -114 +102 @@
                 rdev->seq_mode = SNDRV_VIRMIDI_SEQ_DISPATCH;
         }
-        
+
         strcpy(card->driver, "VirMIDI");
         strcpy(card->shortname, "VirMIDI");
         sprintf(card->longname, "Virtual MIDI Card %i", dev + 1);
 
-        snd_card_set_dev(card, &devptr->dev);
-
-        if ((err = snd_card_register(card)) == 0) {
+        err = snd_card_register(card);
+        if (!err) {
                 platform_set_drvdata(devptr, card);
                 return 0;
         }
-      __nodev:
+__nodev:
         snd_card_free(card);
         return err;
 }
 
-static int __devexit snd_virmidi_remove(struct platform_device *devptr)
+static int snd_virmidi_remove(struct platform_device *devptr)
 {
         snd_card_free(platform_get_drvdata(devptr));
-        platform_set_drvdata(devptr, NULL);
         return 0;
 }
@@ -141 +127 @@
 static struct platform_driver snd_virmidi_driver = {
         .probe          = snd_virmidi_probe,
-        .remove         = __devexit_p(snd_virmidi_remove),
+        .remove         = snd_virmidi_remove,
         .driver         = {
-                .name   = SND_VIRMIDI_DRIVER
+                .name   = SND_VIRMIDI_DRIVER,
         },
 };
@@ -160 +146 @@
         int i, cards, err;
 
-        if ((err = platform_driver_register(&snd_virmidi_driver)) < 0)
+        err = platform_driver_register(&snd_virmidi_driver);
+        if (err < 0)
                 return err;
 
@@ -166 +153 @@
         for (i = 0; i < SNDRV_CARDS; i++) {
                 struct platform_device *device;
-                if (! enable[i])
+
+                if (!enable[i])
                         continue;
                 device = platform_device_register_simple(SND_VIRMIDI_DRIVER,