diff options
| author | Joe Perches | 2010-03-29 09:34:29 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2010-05-11 20:35:40 +0200 |
| commit | 7d4984d8424182eba2774755ae2ae8145651e788 (patch) | |
| tree | c916bdc91e5fd1ab3822349592e41b6260d85293 | |
| parent | Staging: dt3155: fix parentheses and bracket spacing style issues (diff) | |
| download | kernel-qcow2-linux-7d4984d8424182eba2774755ae2ae8145651e788.tar.gz kernel-qcow2-linux-7d4984d8424182eba2774755ae2ae8145651e788.tar.xz kernel-qcow2-linux-7d4984d8424182eba2774755ae2ae8145651e788.zip | |
Staging: dt3155: allocator.c: sparse cleanups
Make prototypes match implementation
Use gfp_t flags not int prio
Still a couple of sparse warnings left
Signed-off-by: Joe Perches <joe@perches.com>
Cc: Simon Horman <horms@verge.net.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/dt3155/allocator.c | 15 | ||||
| -rw-r--r-- | drivers/staging/dt3155/allocator.h | 4 |
2 files changed, 10 insertions, 9 deletions
diff --git a/drivers/staging/dt3155/allocator.c b/drivers/staging/dt3155/allocator.c index 6fbd0507288c..bd5adbc2a238 100644 --- a/drivers/staging/dt3155/allocator.c +++ b/drivers/staging/dt3155/allocator.c @@ -58,6 +58,8 @@ #include <asm/page.h> +#include "allocator.h" + /*#define ALL_DEBUG*/ #define ALL_MSG "allocator: " @@ -83,9 +85,9 @@ /*#define PDEBUGG(fmt, args...) printk( KERN_DEBUG ALL_MSG fmt, ## args)*/ -int allocator_himem = 1; /* 0 = probe, pos. = megs, neg. = disable */ -int allocator_step = 1; /* This is the step size in MB */ -int allocator_probe = 1; /* This is a flag -- 1=probe, 0=don't probe */ +static int allocator_himem = 1; /* 0 = probe, pos. = megs, neg. = disable */ +static int allocator_step = 1; /* This is the step size in MB */ +static int allocator_probe = 1; /* This is a flag -- 1=probe, 0=don't probe */ static unsigned long allocator_buffer; /* physical address */ static unsigned long allocator_buffer_size; /* kilobytes */ @@ -101,8 +103,7 @@ struct allocator_struct { struct allocator_struct *next; }; -struct allocator_struct *allocator_list; - +static struct allocator_struct *allocator_list; #ifdef ALL_DEBUG static int dump_list(void) @@ -124,7 +125,7 @@ static int dump_list(void) * be used straight ahead for DMA, but needs remapping for program use). */ -unsigned long allocator_allocate_dma(unsigned long kilobytes, int prio) +unsigned long allocator_allocate_dma(unsigned long kilobytes, gfp_t flags) { struct allocator_struct *ptr = allocator_list, *newptr; unsigned long bytes = kilobytes << 10; @@ -147,7 +148,7 @@ unsigned long allocator_allocate_dma(unsigned long kilobytes, int prio) PDEBUG("alloc failed\n"); return 0; /* end of list */ } - newptr = kmalloc(sizeof(struct allocator_struct), prio); + newptr = kmalloc(sizeof(struct allocator_struct), flags); if (!newptr) return 0; diff --git a/drivers/staging/dt3155/allocator.h b/drivers/staging/dt3155/allocator.h index bdf3268ca52d..425b70fcd500 100644 --- a/drivers/staging/dt3155/allocator.h +++ b/drivers/staging/dt3155/allocator.h @@ -22,7 +22,7 @@ * */ -void allocator_free_dma(unsigned long address); -unsigned long allocator_allocate_dma(unsigned long kilobytes, int priority); +int allocator_free_dma(unsigned long address); +unsigned long allocator_allocate_dma(unsigned long kilobytes, gfp_t flags); int allocator_init(u32 *); void allocator_cleanup(void); |