Skip to content

Commit

Permalink
[PATCH] gfp_t: sound
Browse files Browse the repository at this point in the history 
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
Al Viro authored and Linus Torvalds committed Oct 28, 2005
1 parent 87b750d commit 1ef64e6
Show file tree
Hide file tree
Showing 12 changed files with 22 additions and 20 deletions.
2 changes: 1 addition & 1 deletion arch/ppc/8xx_io/cs4218.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions arch/ppc/8xx_io/cs4218_tdm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion include/sound/memalloc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
4 changes: 2 additions & 2 deletions sound/core/memalloc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
5 changes: 3 additions & 2 deletions sound/core/seq/instr/ainstr_gf1.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions sound/core/seq/instr/ainstr_iw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ static int snd_seq_iwffff_copy_wave_from_stream(snd_iwffff_ops_t *ops,
iwffff_wave_t *wp, *prev;
iwffff_xwave_t xp;
int err;
unsigned int gfp_mask;
gfp_t gfp_mask;
unsigned int real_size;

gfp_mask = atomic ? GFP_ATOMIC : GFP_KERNEL;
Expand Down Expand Up @@ -236,7 +236,7 @@ static int snd_seq_iwffff_put(void *private_data, snd_seq_kinstr_t *instr,
iwffff_layer_t *lp, *prev_lp;
iwffff_xlayer_t lx;
int err;
unsigned int gfp_mask;
gfp_t gfp_mask;

if (cmd != SNDRV_SEQ_INSTR_PUT_CMD_CREATE)
return -EINVAL;
Expand Down
3 changes: 2 additions & 1 deletion sound/core/seq/instr/ainstr_simple.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ static int snd_seq_simple_put(void *private_data, snd_seq_kinstr_t *instr,
snd_simple_ops_t *ops = (snd_simple_ops_t *)private_data;
simple_instrument_t *ip;
simple_xinstrument_t ix;
int err, gfp_mask;
int err;
gfp_t gfp_mask;
unsigned int real_size;

if (cmd != SNDRV_SEQ_INSTR_PUT_CMD_CREATE)
Expand Down
2 changes: 1 addition & 1 deletion sound/oss/dmasound/dmasound.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ typedef struct {
const char *name;
const char *name2;
struct module *owner;
void *(*dma_alloc)(unsigned int, int);
void *(*dma_alloc)(unsigned int, gfp_t);
void (*dma_free)(void *, unsigned int);
int (*irqinit)(void);
#ifdef MODULE
Expand Down
4 changes: 2 additions & 2 deletions sound/oss/dmasound/dmasound_atari.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ static ssize_t ata_ctx_u16le(const u_char *userPtr, size_t userCount,
/*** Low level stuff *********************************************************/


static void *AtaAlloc(unsigned int size, int flags);
static void *AtaAlloc(unsigned int size, gfp_t flags);
static void AtaFree(void *, unsigned int size);
static int AtaIrqInit(void);
#ifdef MODULE
Expand Down Expand Up @@ -810,7 +810,7 @@ static TRANS transFalconExpanding = {
* Atari (TT/Falcon)
*/

static void *AtaAlloc(unsigned int size, int flags)
static void *AtaAlloc(unsigned int size, gfp_t flags)
{
return atari_stram_alloc(size, "dmasound");
}
Expand Down
4 changes: 2 additions & 2 deletions sound/oss/dmasound/dmasound_awacs.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ int expand_read_bal; /* Balance factor for expanding reads (not volume!) */

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

static void *PMacAlloc(unsigned int size, int flags);
static void *PMacAlloc(unsigned int size, gfp_t flags);
static void PMacFree(void *ptr, unsigned int size);
static int PMacIrqInit(void);
#ifdef MODULE
Expand Down Expand Up @@ -614,7 +614,7 @@ tas_init_frame_rates(unsigned int *prop, unsigned int l)
/*
* PCI PowerMac, with AWACS, Screamer, Burgundy, DACA or Tumbler and DBDMA.
*/
static void *PMacAlloc(unsigned int size, int flags)
static void *PMacAlloc(unsigned int size, gfp_t flags)
{
return kmalloc(size, flags);
}
Expand Down
4 changes: 2 additions & 2 deletions sound/oss/dmasound/dmasound_paula.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ static int write_sq_block_size_half, write_sq_block_size_quarter;
/*** Low level stuff *********************************************************/


static void *AmiAlloc(unsigned int size, int flags);
static void *AmiAlloc(unsigned int size, gfp_t flags);
static void AmiFree(void *obj, unsigned int size);
static int AmiIrqInit(void);
#ifdef MODULE
Expand Down Expand Up @@ -317,7 +317,7 @@ static inline void StopDMA(void)
enable_heartbeat();
}

static void *AmiAlloc(unsigned int size, int flags)
static void *AmiAlloc(unsigned int size, gfp_t flags)
{
return amiga_chip_alloc((long)size, "dmasound [Paula]");
}
Expand Down
4 changes: 2 additions & 2 deletions sound/oss/dmasound/dmasound_q40.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ static int expand_data; /* Data for expanding */
/*** Low level stuff *********************************************************/


static void *Q40Alloc(unsigned int size, int flags);
static void *Q40Alloc(unsigned int size, gfp_t flags);
static void Q40Free(void *, unsigned int);
static int Q40IrqInit(void);
#ifdef MODULE
Expand Down Expand Up @@ -358,7 +358,7 @@ static TRANS transQ40Compressing = {

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

static void *Q40Alloc(unsigned int size, int flags)
static void *Q40Alloc(unsigned int size, gfp_t flags)
{
return kmalloc(size, flags); /* change to vmalloc */
}
Expand Down

0 comments on commit 1ef64e6

Please sign in to comment.