openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[ALSA] sound/core Fix the sparse warning 'implicit cast to nocast type' 

Memalloc module,ALSA Core,Instrument layer
Fix the sparse warning 'implicit cast to nocast type'

File/Subsystem:sound/core

Signed-off-by: Victor Fusco <victor@cetuc.puc-rio.br>
Signed-off-by: Domen Puncer <domen@coderock.org>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>
This commit is contained in:
Victor Fusco 2005-07-26 13:42:31 +02:00 committed by Jaroslav Kysela
parent 854af9578c
commit 5a0f217d96
7 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/sound/core.h
View File

@ -290,12 +290,12 @@ void snd_memory_init(void);
void snd_memory_done(void); void snd_memory_done(void);
int snd_memory_info_init(void); int snd_memory_info_init(void);
int snd_memory_info_done(void); int snd_memory_info_done(void);
void *snd_hidden_kmalloc(size_t size, int flags); void *snd_hidden_kmalloc(size_t size, unsigned int __nocast flags);
void *snd_hidden_kcalloc(size_t n, size_t size, int flags); void *snd_hidden_kcalloc(size_t n, size_t size, unsigned int __nocast flags);
void snd_hidden_kfree(const void *obj); void snd_hidden_kfree(const void *obj);
void *snd_hidden_vmalloc(unsigned long size); void *snd_hidden_vmalloc(unsigned long size);
void snd_hidden_vfree(void *obj); void snd_hidden_vfree(void *obj);
char *snd_hidden_kstrdup(const char *s, int flags); char *snd_hidden_kstrdup(const char *s, unsigned int __nocast flags);
#define kmalloc(size, flags) snd_hidden_kmalloc(size, flags) #define kmalloc(size, flags) snd_hidden_kmalloc(size, flags)
#define kcalloc(n, size, flags) snd_hidden_kcalloc(n, size, flags) #define kcalloc(n, size, flags) snd_hidden_kcalloc(n, size, flags)
#define kfree(obj) snd_hidden_kfree(obj) #define kfree(obj) snd_hidden_kfree(obj)

2
include/sound/driver.h
View File

@ -51,7 +51,7 @@
#ifdef CONFIG_SND_DEBUG_MEMORY #ifdef CONFIG_SND_DEBUG_MEMORY
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
void *snd_wrapper_kmalloc(size_t, int); void *snd_wrapper_kmalloc(size_t, unsigned int __nocast);
#undef kmalloc #undef kmalloc
void snd_wrapper_kfree(const void *); void snd_wrapper_kfree(const void *);
#undef kfree #undef kfree

3
sound/core/memalloc.c
View File

@ -105,7 +105,8 @@ struct snd_mem_list {
*/ */
static void *snd_dma_hack_alloc_coherent(struct device *dev, size_t size, static void *snd_dma_hack_alloc_coherent(struct device *dev, size_t size,
dma_addr_t *dma_handle, int flags) dma_addr_t *dma_handle,
unsigned int __nocast flags)
{ {
void *ret; void *ret;
u64 dma_mask, coherent_dma_mask; u64 dma_mask, coherent_dma_mask;

8
sound/core/memory.c
View File

@ -89,7 +89,7 @@ void snd_memory_done(void)
} }
} }
static void *__snd_kmalloc(size_t size, int flags, void *caller) static void *__snd_kmalloc(size_t size, unsigned int __nocast flags, void *caller)
{ {
unsigned long cpu_flags; unsigned long cpu_flags;
struct snd_alloc_track *t; struct snd_alloc_track *t;
@ -111,12 +111,12 @@ static void *__snd_kmalloc(size_t size, int flags, void *caller)
} }
#define _snd_kmalloc(size, flags) __snd_kmalloc((size), (flags), __builtin_return_address(0)); #define _snd_kmalloc(size, flags) __snd_kmalloc((size), (flags), __builtin_return_address(0));
void *snd_hidden_kmalloc(size_t size, int flags) void *snd_hidden_kmalloc(size_t size, unsigned int __nocast flags)
{ {
return _snd_kmalloc(size, flags); return _snd_kmalloc(size, flags);
} }
void *snd_hidden_kcalloc(size_t n, size_t size, int flags) void *snd_hidden_kcalloc(size_t n, size_t size, unsigned int __nocast flags)
{ {
void *ret = NULL; void *ret = NULL;
if (n != 0 && size > INT_MAX / n) if (n != 0 && size > INT_MAX / n)
@ -184,7 +184,7 @@ void snd_hidden_vfree(void *obj)
snd_wrapper_vfree(obj); snd_wrapper_vfree(obj);
} }
char *snd_hidden_kstrdup(const char *s, int flags) char *snd_hidden_kstrdup(const char *s, unsigned int __nocast flags)
{ {
int len; int len;
char *buf; char *buf;

3
sound/core/seq/instr/ainstr_gf1.c
View File

@ -50,7 +50,8 @@ static int snd_seq_gf1_copy_wave_from_stream(snd_gf1_ops_t *ops,
{ {
gf1_wave_t *wp, *prev; gf1_wave_t *wp, *prev;
gf1_xwave_t xp; gf1_xwave_t xp;
int err, gfp_mask; int err;
unsigned int gfp_mask;
unsigned int real_size; unsigned int real_size;
gfp_mask = atomic ? GFP_ATOMIC : GFP_KERNEL; gfp_mask = atomic ? GFP_ATOMIC : GFP_KERNEL;

8
sound/core/seq/instr/ainstr_iw.c
View File

@ -58,7 +58,7 @@ static int snd_seq_iwffff_copy_env_from_stream(__u32 req_stype,
iwffff_xenv_t *ex, iwffff_xenv_t *ex,
char __user **data, char __user **data,
long *len, long *len,
int gfp_mask) unsigned int __nocast gfp_mask)
{ {
__u32 stype; __u32 stype;
iwffff_env_record_t *rp, *rp_last; iwffff_env_record_t *rp, *rp_last;
@ -128,7 +128,8 @@ static int snd_seq_iwffff_copy_wave_from_stream(snd_iwffff_ops_t *ops,
{ {
iwffff_wave_t *wp, *prev; iwffff_wave_t *wp, *prev;
iwffff_xwave_t xp; iwffff_xwave_t xp;
int err, gfp_mask; int err;
unsigned int gfp_mask;
unsigned int real_size; unsigned int real_size;
gfp_mask = atomic ? GFP_ATOMIC : GFP_KERNEL; gfp_mask = atomic ? GFP_ATOMIC : GFP_KERNEL;
@ -234,7 +235,8 @@ static int snd_seq_iwffff_put(void *private_data, snd_seq_kinstr_t *instr,
iwffff_xinstrument_t ix; iwffff_xinstrument_t ix;
iwffff_layer_t *lp, *prev_lp; iwffff_layer_t *lp, *prev_lp;
iwffff_xlayer_t lx; iwffff_xlayer_t lx;
int err, gfp_mask; int err;
unsigned int gfp_mask;
if (cmd != SNDRV_SEQ_INSTR_PUT_CMD_CREATE) if (cmd != SNDRV_SEQ_INSTR_PUT_CMD_CREATE)
return -EINVAL; return -EINVAL;

2
sound/core/wrappers.c
View File

@ -27,7 +27,7 @@
#include <linux/fs.h> #include <linux/fs.h>
#ifdef CONFIG_SND_DEBUG_MEMORY #ifdef CONFIG_SND_DEBUG_MEMORY
void *snd_wrapper_kmalloc(size_t size, int flags) void *snd_wrapper_kmalloc(size_t size, unsigned int __nocast flags)
{ {
return kmalloc(size, flags); return kmalloc(size, flags);
} }