Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5a0f217d authored by Victor Fusco's avatar Victor Fusco Committed by Jaroslav Kysela
Browse files

[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: default avatarVictor Fusco <victor@cetuc.puc-rio.br>
Signed-off-by: default avatarDomen Puncer <domen@coderock.org>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 854af957

include/sound/core.h

+3 −3
Original line number Diff line number Diff line
@@ -290,12 +290,12 @@ void snd_memory_init(void); 
void snd_memory_done(void);

int snd_memory_info_init(void);

int snd_memory_info_done(void);

void *snd_hidden_kmalloc(size_t size, int flags);

void *snd_hidden_kcalloc(size_t n, 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, unsigned int __nocast flags);

void snd_hidden_kfree(const void *obj);

void *snd_hidden_vmalloc(unsigned long size);

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 kcalloc(n, size, flags) snd_hidden_kcalloc(n, size, flags)

#define kfree(obj) snd_hidden_kfree(obj)

include/sound/driver.h

+1 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
#ifdef CONFIG_SND_DEBUG_MEMORY

#include <linux/slab.h>

#include <linux/vmalloc.h>

void *snd_wrapper_kmalloc(size_t, int);

void *snd_wrapper_kmalloc(size_t, unsigned int __nocast);

#undef kmalloc

void snd_wrapper_kfree(const void *);

#undef kfree

sound/core/memalloc.c

+2 −1
Original line number Diff line number Diff line
@@ -105,7 +105,8 @@ struct snd_mem_list { 
 */



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;

	u64 dma_mask, coherent_dma_mask;

sound/core/memory.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

	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));

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);

}



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;

	if (n != 0 && size > INT_MAX / n)
@@ -184,7 +184,7 @@ void snd_hidden_vfree(void *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;

	char *buf;

sound/core/seq/instr/ainstr_gf1.c

+2 −1
Original line number Diff line number Diff line
@@ -50,7 +50,8 @@ 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, gfp_mask;

	int err;

	unsigned int gfp_mask;

	unsigned int real_size;

	

	gfp_mask = atomic ? GFP_ATOMIC : GFP_KERNEL;