lkml.org 
[lkml]   [2010]   [Mar]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/3] drivers/staging/dt3155/allocator: sparse cleanups
    Date
    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>
    ---
    drivers/staging/dt3155/allocator.c | 15 ++++++++-------
    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 c74234c..217ddaa 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 bdf3268..425b70f 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);
    --
    1.7.0.14.g7e948


    \
     
     \ /
      Last update: 2010-03-29 09:37    [W:0.022 / U:30.332 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site