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

Commit e38e0cfa authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

[ALSA] Remove kmalloc wrappers 



Modules: ALSA Core

Remove kmalloc wrappers.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent b1d5776d

include/sound/core.h

+0 −25
Original line number Original line Diff line number Diff line
@@ -284,31 +284,6 @@ int snd_oss_init_module(void); 




/* memory.c */

/* memory.c */





#ifdef CONFIG_SND_DEBUG_MEMORY

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, gfp_t flags);

void *snd_hidden_kzalloc(size_t size, gfp_t flags);

void *snd_hidden_kcalloc(size_t n, size_t size, gfp_t flags);

void snd_hidden_kfree(const void *obj);

char *snd_hidden_kstrdup(const char *s, gfp_t flags);

#define kmalloc(size, flags) snd_hidden_kmalloc(size, flags)

#define kzalloc(size, flags) snd_hidden_kzalloc(size, flags)

#define kcalloc(n, size, flags) snd_hidden_kcalloc(n, size, flags)

#define kfree(obj) snd_hidden_kfree(obj)

#define kmalloc_nocheck(size, flags) snd_wrapper_kmalloc(size, flags)

#define kfree_nocheck(obj) snd_wrapper_kfree(obj)

#define kstrdup(s, flags)  snd_hidden_kstrdup(s, flags)

#else

#define snd_memory_init() /*NOP*/

#define snd_memory_done() /*NOP*/

#define snd_memory_info_init() /*NOP*/

#define snd_memory_info_done() /*NOP*/

#define kmalloc_nocheck(size, flags) kmalloc(size, flags)

#define kfree_nocheck(obj) kfree(obj)

#endif

int copy_to_user_fromio(void __user *dst, const volatile void __iomem *src, size_t count);

int copy_to_user_fromio(void __user *dst, const volatile void __iomem *src, size_t count);

int copy_from_user_toio(volatile void __iomem *dst, const void __user *src, size_t count);

int copy_from_user_toio(volatile void __iomem *dst, const void __user *src, size_t count);

include/sound/driver.h

+0 −13
Original line number Original line Diff line number Diff line
@@ -44,17 +44,4 @@ 




#include <linux/module.h>

#include <linux/module.h>





/*

 *  ==========================================================================

 */



#ifdef CONFIG_SND_DEBUG_MEMORY

#include <linux/slab.h>

#include <linux/vmalloc.h>

void *snd_wrapper_kmalloc(size_t, gfp_t);

#undef kmalloc

void snd_wrapper_kfree(const void *);

#undef kfree

#endif



#endif /* __SOUND_DRIVER_H */
 
#endif /* __SOUND_DRIVER_H */

sound/core/Kconfig

+0 −6
Original line number Original line Diff line number Diff line
@@ -127,12 +127,6 @@ config SND_DEBUG 
	help

	help

	  Say Y here to enable ALSA debug code.

	  Say Y here to enable ALSA debug code.





config SND_DEBUG_MEMORY

	bool "Debug memory"

	depends on SND_DEBUG

	help

	  Say Y here to enable debugging of memory allocations.



config SND_DEBUG_DETECT

config SND_DEBUG_DETECT

	bool "Debug detection"

	bool "Debug detection"

	depends on SND_DEBUG

	depends on SND_DEBUG

sound/core/Makefile

+1 −2
Original line number Original line Diff line number Diff line
@@ -3,8 +3,7 @@ 
# Copyright (c) 1999,2001 by Jaroslav Kysela <perex@suse.cz>

# Copyright (c) 1999,2001 by Jaroslav Kysela <perex@suse.cz>

#

#





snd-objs     := sound.o init.o memory.o info.o control.o misc.o \

snd-objs     := sound.o init.o memory.o info.o control.o misc.o device.o

                device.o wrappers.o

ifeq ($(CONFIG_ISA_DMA_API),y)

ifeq ($(CONFIG_ISA_DMA_API),y)

snd-objs     += isadma.o

snd-objs     += isadma.o

endif

endif

sound/core/info.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -566,7 +566,6 @@ int __init snd_info_init(void) 
	}

	}

#endif

#endif

	snd_info_version_init();

	snd_info_version_init();

	snd_memory_info_init();

	snd_minor_info_init();

	snd_minor_info_init();

	snd_minor_info_oss_init();

	snd_minor_info_oss_init();

	snd_card_info_init();

	snd_card_info_init();
@@ -578,7 +577,6 @@ int __exit snd_info_done(void) 
	snd_card_info_done();

	snd_card_info_done();

	snd_minor_info_oss_done();

	snd_minor_info_oss_done();

	snd_minor_info_done();

	snd_minor_info_done();

	snd_memory_info_done();

	snd_info_version_done();

	snd_info_version_done();

	if (snd_proc_root) {

	if (snd_proc_root) {

#if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE)

#if defined(CONFIG_SND_SEQUENCER) || defined(CONFIG_SND_SEQUENCER_MODULE)