Changeset 679 for GPL/trunk/alsa-kernel/synth/emux/emux.c

Timestamp:

Mar 18, 2021, 8:57:36 PM (5 years ago)

Author:

David Azarewicz

Message:

Merge changes from Paul's uniaud32next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/synth/emux/emux.c (modified) (7 diffs)

GPL/trunk/alsa-kernel/synth/emux/emux.c

@@ +1 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  *  Copyright (C) 2000 Takashi Iwai <tiwai@suse.de>
  *
  *  Routines for control of EMU WaveTable chip
- *
- *   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
  */
 
@@ -25 +12 @@
 #include <sound/emux_synth.h>
 #include <linux/init.h>
+#include <linux/module.h>
 #include "emux_voice.h"
 
@@ -47 +35 @@
 
         emu->client = -1;
-#ifdef CONFIG_SND_SEQUENCER_OSS
+#if IS_ENABLED(CONFIG_SND_SEQUENCER_OSS)
         emu->oss_synth = NULL;
 #endif
@@ -53 +41 @@
         emu->use_time = 0;
 
+#ifndef TARGET_OS2
+        timer_setup(&emu->tlist, snd_emux_timer_callback, 0);
+#else
         init_timer(&emu->tlist);
-        emu->tlist.function = snd_emux_timer_callback;
+        emu->tlist.function = (void(*)(unsigned long))snd_emux_timer_callback;
         emu->tlist.data = (unsigned long)emu;
+#endif
         emu->timer_active = 0;
 
@@ -125 +117 @@
 
         snd_emux_init_seq(emu, card, index);
-#ifdef CONFIG_SND_SEQUENCER_OSS
+#if IS_ENABLED(CONFIG_SND_SEQUENCER_OSS)
         snd_emux_init_seq_oss(emu);
 #endif
         snd_emux_init_virmidi(emu, card);
 
-#ifdef CONFIG_PROC_FS
         snd_emux_proc_init(emu, card, index);
-#endif
         return 0;
 }
@@ -152 +142 @@
         spin_unlock_irqrestore(&emu->voice_lock, flags);
 
-#ifdef CONFIG_PROC_FS
         snd_emux_proc_free(emu);
-#endif
         snd_emux_delete_virmidi(emu);
-#ifdef CONFIG_SND_SEQUENCER_OSS
+#if IS_ENABLED(CONFIG_SND_SEQUENCER_OSS)
         snd_emux_detach_seq_oss(emu);
 #endif
         snd_emux_detach_seq(emu);
-
         snd_emux_delete_hwdep(emu);
-
-        if (emu->sflist)
-                snd_sf_free(emu->sflist);
-
+        snd_sf_free(emu->sflist);
         kfree(emu->voices);
         kfree(emu->name);
@@ -173 +157 @@
 
 EXPORT_SYMBOL(snd_emux_free);
-
-
-/*
- *  INIT part
- */
-
-static int __init alsa_emux_init(void)
-{
-        return 0;
-}
-
-static void __exit alsa_emux_exit(void)
-{
-}
-
-module_init(alsa_emux_init)
-module_exit(alsa_emux_exit)