Commit 7d4984d8 authored by Joe Perches's avatar Joe Perches Committed by Greg Kroah-Hartman

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: default avatarJoe Perches <joe@perches.com>
Cc: Simon Horman <horms@verge.net.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent d241fd58
...@@ -58,6 +58,8 @@ ...@@ -58,6 +58,8 @@
#include <asm/page.h> #include <asm/page.h>
#include "allocator.h"
/*#define ALL_DEBUG*/ /*#define ALL_DEBUG*/
#define ALL_MSG "allocator: " #define ALL_MSG "allocator: "
...@@ -83,9 +85,9 @@ ...@@ -83,9 +85,9 @@
/*#define PDEBUGG(fmt, args...) printk( KERN_DEBUG ALL_MSG fmt, ## args)*/ /*#define PDEBUGG(fmt, args...) printk( KERN_DEBUG ALL_MSG fmt, ## args)*/
int allocator_himem = 1; /* 0 = probe, pos. = megs, neg. = disable */ static int allocator_himem = 1; /* 0 = probe, pos. = megs, neg. = disable */
int allocator_step = 1; /* This is the step size in MB */ static 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_probe = 1; /* This is a flag -- 1=probe, 0=don't probe */
static unsigned long allocator_buffer; /* physical address */ static unsigned long allocator_buffer; /* physical address */
static unsigned long allocator_buffer_size; /* kilobytes */ static unsigned long allocator_buffer_size; /* kilobytes */
...@@ -101,8 +103,7 @@ struct allocator_struct { ...@@ -101,8 +103,7 @@ struct allocator_struct {
struct allocator_struct *next; struct allocator_struct *next;
}; };
struct allocator_struct *allocator_list; static struct allocator_struct *allocator_list;
#ifdef ALL_DEBUG #ifdef ALL_DEBUG
static int dump_list(void) static int dump_list(void)
...@@ -124,7 +125,7 @@ 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). * 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; struct allocator_struct *ptr = allocator_list, *newptr;
unsigned long bytes = kilobytes << 10; unsigned long bytes = kilobytes << 10;
...@@ -147,7 +148,7 @@ unsigned long allocator_allocate_dma(unsigned long kilobytes, int prio) ...@@ -147,7 +148,7 @@ unsigned long allocator_allocate_dma(unsigned long kilobytes, int prio)
PDEBUG("alloc failed\n"); PDEBUG("alloc failed\n");
return 0; /* end of list */ return 0; /* end of list */
} }
newptr = kmalloc(sizeof(struct allocator_struct), prio); newptr = kmalloc(sizeof(struct allocator_struct), flags);
if (!newptr) if (!newptr)
return 0; return 0;
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
* *
*/ */
void allocator_free_dma(unsigned long address); int allocator_free_dma(unsigned long address);
unsigned long allocator_allocate_dma(unsigned long kilobytes, int priority); unsigned long allocator_allocate_dma(unsigned long kilobytes, gfp_t flags);
int allocator_init(u32 *); int allocator_init(u32 *);
void allocator_cleanup(void); void allocator_cleanup(void);
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment