[PATCH] gfp_t: sound

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

4 files changed, 9 insertions, 7 deletions

diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c
index e72cec77f0db..129abab5ce98 100644
--- a/sound/core/memalloc.c
+++ b/sound/core/memalloc.c
@@ -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);
diff --git a/sound/core/seq/instr/ainstr_gf1.c b/sound/core/seq/instr/ainstr_gf1.c
index 207c2c54bf1d..0e4df8826eed 100644
--- a/sound/core/seq/instr/ainstr_gf1.c
+++ b/sound/core/seq/instr/ainstr_gf1.c
@@ -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;
diff --git a/sound/core/seq/instr/ainstr_iw.c b/sound/core/seq/instr/ainstr_iw.c
index 67c24c8e8e7b..7c19fbbc5d0f 100644
--- a/sound/core/seq/instr/ainstr_iw.c
+++ b/sound/core/seq/instr/ainstr_iw.c
@@ -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;
@@ -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;
diff --git a/sound/core/seq/instr/ainstr_simple.c b/sound/core/seq/instr/ainstr_simple.c
index 6183d2151034..17ab94e76073 100644
--- a/sound/core/seq/instr/ainstr_simple.c
+++ b/sound/core/seq/instr/ainstr_simple.c
@@ -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)