Changeset 679 for GPL/trunk/alsa-kernel/include/sound/initval.h

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/include/sound/initval.h (modified) (6 diffs)

GPL/trunk/alsa-kernel/include/sound/initval.h

@@ +1 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
 #ifndef __SOUND_INITVAL_H
 #define __SOUND_INITVAL_H
@@ -5 +6 @@
  *  Init values for soundcard modules
  *  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
- *
  */
 
@@ -36 +22 @@
 #define MODULE_DEVICES(val) 
 #define MODULE_PARM_SYNTAX(id, val) 
-#define module_param_array(name, type, nump, perm)
-#define module_param(name, type, perm)
 #else
 #define MODULE_CLASSES(val) MODULE_GENERIC_STRING(info_classes, val)
@@ -120 +104 @@
 #define SNDRV_PORT_DESC         SNDRV_ENABLED ",allows:{{0,0xffff}},base:16"
 
+#ifdef SNDRV_LEGACY_FIND_FREE_IOPORT
+static long snd_legacy_find_free_ioport(const long *port_table, long size)
+{
+        while (*port_table != -1) {
+                if (request_region(*port_table, size, "ALSA test")) {
+                        release_region(*port_table, size);
+                        return *port_table;
+                }
+                port_table++;
+        }
+        return -1;
+}
+#endif
+
 #ifdef SNDRV_LEGACY_FIND_FREE_IRQ
 #include <linux/interrupt.h>
@@ -128 +126 @@
 }
 
-static int snd_legacy_find_free_irq(int *irq_table)
+static int snd_legacy_find_free_irq(const int *irq_table)
 {
         while (*irq_table != -1) {
                 if (!request_irq(*irq_table, snd_legacy_empty_irq_handler,
-                                 IRQF_DISABLED | IRQF_PROBE_SHARED, "ALSA Test IRQ",
+                                 IRQF_PROBE_SHARED, "ALSA Test IRQ",
                                  (void *) irq_table)) {
                         free_irq(*irq_table, (void *) irq_table);
@@ -144 +142 @@
 
 #ifdef SNDRV_LEGACY_FIND_FREE_DMA
-static int snd_legacy_find_free_dma(int *dma_table)
+static int snd_legacy_find_free_dma(const int *dma_table)
 {
         while (*dma_table != -1) {