Changeset 717 for GPL/trunk/alsa-kernel/include/sound/emu10k1.h

Timestamp:

Aug 7, 2022, 6:11:12 PM (3 years ago)

Author:

David Azarewicz

Message:

Merge changes from next branch.

Location:

GPL/trunk

Files:

• . (modified) (1 prop)
• alsa-kernel/include/sound/emu10k1.h (modified) (3 diffs)

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

@@ -1702 +1702 @@
         struct snd_dma_buffer ptb_pages;        /* page table pages */
         struct snd_dma_device p16v_dma_dev;
-        struct snd_dma_buffer p16v_buffer;
+        struct snd_dma_buffer *p16v_buffer;
 
         struct snd_util_memhdr *memhdr;         /* page allocation list */
@@ -1797 +1797 @@
                        long max_cache_bytes,
                        int enable_ir,
-                       uint subsystem,
-                       struct snd_emu10k1 ** remu);
+                       uint subsystem);
 
 int snd_emu10k1_pcm(struct snd_emu10k1 *emu, int device);
@@ -1804 +1803 @@
 int snd_emu10k1_pcm_efx(struct snd_emu10k1 *emu, int device);
 int snd_p16v_pcm(struct snd_emu10k1 *emu, int device);
-int snd_p16v_free(struct snd_emu10k1 * emu);
 int snd_p16v_mixer(struct snd_emu10k1 * emu);
 int snd_emu10k1_pcm_multi(struct snd_emu10k1 *emu, int device);