Changeset 717 for GPL/trunk/alsa-kernel/pci/emu10k1/p16v.c

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/pci/emu10k1/p16v.c (modified) (4 diffs)

GPL/trunk/alsa-kernel/pci/emu10k1/p16v.c

@@ -291 +291 @@
         struct snd_pcm_runtime *runtime = substream->runtime;
         int channel = substream->pcm->device - emu->p16v_device_offset;
-        u32 *table_base = (u32 *)(emu->p16v_buffer.area+(8*16*channel));
+        u32 *table_base = (u32 *)(emu->p16v_buffer->area+(8*16*channel));
         u32 period_size_bytes = frames_to_bytes(runtime, runtime->period_size);
         int i;
@@ -309 +309 @@
         dev_dbg(emu->card->dev,
                 "dma_addr=%x, dma_area=%p, dma_bytes(size)=%x\n",
-                   emu->p16v_buffer.addr, emu->p16v_buffer.area,
-                   emu->p16v_buffer.bytes);
+                   emu->p16v_buffer->addr, emu->p16v_buffer->area,
+                   emu->p16v_buffer->bytes);
 #endif /* debug */
         tmp = snd_emu10k1_ptr_read(emu, A_SPDIF_SAMPLERATE, channel);
@@ -334 +334 @@
         }
  
-        snd_emu10k1_ptr20_write(emu, PLAYBACK_LIST_ADDR, channel, emu->p16v_buffer.addr+(8*16*channel));
+        snd_emu10k1_ptr20_write(emu, PLAYBACK_LIST_ADDR, channel, emu->p16v_buffer->addr+(8*16*channel));
         snd_emu10k1_ptr20_write(emu, PLAYBACK_LIST_SIZE, channel, (runtime->periods - 1) << 19);
         snd_emu10k1_ptr20_write(emu, PLAYBACK_LIST_PTR, channel, 0);
@@ -567 +567 @@
         .pointer =     snd_p16v_pcm_pointer_capture,
 };
-
-
-int snd_p16v_free(struct snd_emu10k1 *chip)
-{
-        // release the data
-        if (chip->p16v_buffer.area) {
-                snd_dma_free_pages(&chip->p16v_buffer);
-                /*
-                dev_dbg(chip->card->dev, "period lables free: %p\n",
-                           &chip->p16v_buffer);
-                */
-        }
-        return 0;
-}
 
 int snd_p16v_pcm(struct snd_emu10k1 *emu, int device)