Skip to content

Commit

Permalink
ALSA: memalloc: Move snd_malloc_ops definition into memalloc.c again
Browse files Browse the repository at this point in the history
The definition of struct snd_malloc_ops was moved out to
memalloc_local.h since there was another code for S/G buffer
allocation referring to the struct.  But since the code change to use
non-contiguous allocators, it's solely referred in memalloc.c, hence
it makes little sense to have a separate header file.

Let's move it back to memalloc.c.

Link: https://patch.msgid.link/20240910113141.32618-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
tiwai committed Sep 10, 2024
1 parent 7e4d4b3 commit 5ced8b9
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 17 deletions.
12 changes: 11 additions & 1 deletion sound/core/memalloc.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,17 @@
#include <asm/set_memory.h>
#endif
#include <sound/memalloc.h>
#include "memalloc_local.h"

struct snd_malloc_ops {
void *(*alloc)(struct snd_dma_buffer *dmab, size_t size);
void (*free)(struct snd_dma_buffer *dmab);
dma_addr_t (*get_addr)(struct snd_dma_buffer *dmab, size_t offset);
struct page *(*get_page)(struct snd_dma_buffer *dmab, size_t offset);
unsigned int (*get_chunk_size)(struct snd_dma_buffer *dmab,
unsigned int ofs, unsigned int size);
int (*mmap)(struct snd_dma_buffer *dmab, struct vm_area_struct *area);
void (*sync)(struct snd_dma_buffer *dmab, enum snd_dma_sync_mode mode);
};

#define DEFAULT_GFP \
(GFP_KERNEL | \
Expand Down
16 changes: 0 additions & 16 deletions sound/core/memalloc_local.h

This file was deleted.

0 comments on commit 5ced8b9

Please sign in to comment.