Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ef64e67 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] gfp_t: sound 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 87b750dc

arch/ppc/8xx_io/cs4218.h

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ typedef struct { 
    const char *name2;

    void (*open)(void);

    void (*release)(void);

    void *(*dma_alloc)(unsigned int, int);

    void *(*dma_alloc)(unsigned int, gfp_t);

    void (*dma_free)(void *, unsigned int);

    int (*irqinit)(void);

#ifdef MODULE

arch/ppc/8xx_io/cs4218_tdm.c

+2 −2
Original line number Diff line number Diff line
@@ -318,7 +318,7 @@ struct cs_sound_settings { 


static struct cs_sound_settings sound;



static void *CS_Alloc(unsigned int size, int flags);

static void *CS_Alloc(unsigned int size, gfp_t flags);

static void CS_Free(void *ptr, unsigned int size);

static int CS_IrqInit(void);

#ifdef MODULE
@@ -959,7 +959,7 @@ static TRANS transCSNormalRead = { 


/*** Low level stuff *********************************************************/



static void *CS_Alloc(unsigned int size, int flags)

static void *CS_Alloc(unsigned int size, gfp_t flags)

{

	int	order;

include/sound/memalloc.h

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ size_t snd_dma_get_reserved_buf(struct snd_dma_buffer *dmab, unsigned int id); 
int snd_dma_reserve_buf(struct snd_dma_buffer *dmab, unsigned int id);



/* basic memory allocation functions */

void *snd_malloc_pages(size_t size, unsigned int gfp_flags);

void *snd_malloc_pages(size_t size, gfp_t gfp_flags);

void snd_free_pages(void *ptr, size_t size);



#endif /* __SOUND_MEMALLOC_H */

sound/core/memalloc.c

+2 −2
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ static void unmark_pages(struct page *page, int order) 
 *

 * Returns the pointer of the buffer, or NULL if no enoguh memory.

 */

void *snd_malloc_pages(size_t size, unsigned int gfp_flags)

void *snd_malloc_pages(size_t size, gfp_t gfp_flags)

{

	int pg;

	void *res;
@@ -235,7 +235,7 @@ static void *snd_malloc_dev_pages(struct device *dev, size_t size, dma_addr_t *d 
{

	int pg;

	void *res;

	unsigned int gfp_flags;

	gfp_t gfp_flags;



	snd_assert(size > 0, return NULL);

	snd_assert(dma != NULL, return NULL);

sound/core/seq/instr/ainstr_gf1.c

+3 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ static int snd_seq_gf1_copy_wave_from_stream(snd_gf1_ops_t *ops, 
	gf1_wave_t *wp, *prev;

	gf1_xwave_t xp;

	int err;

	unsigned int gfp_mask;

	gfp_t gfp_mask;

	unsigned int real_size;

	

	gfp_mask = atomic ? GFP_ATOMIC : GFP_KERNEL;
@@ -144,7 +144,8 @@ static int snd_seq_gf1_put(void *private_data, snd_seq_kinstr_t *instr, 
	snd_gf1_ops_t *ops = (snd_gf1_ops_t *)private_data;

	gf1_instrument_t *ip;

	gf1_xinstrument_t ix;

	int err, gfp_mask;

	int err;

	gfp_t gfp_mask;



	if (cmd != SNDRV_SEQ_INSTR_PUT_CMD_CREATE)

		return -EINVAL;