Audio: DLKM support for all audio modules

Switch to DLKM for all audio kernel modules.

Change-Id: I6a96023a21f655f873531af9ace81f2b01eb0f58
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>

dsp/codecs/Android.mk

@@ -0,0 +1,54 @@
+# Android makefile for audio kernel modules
+
+# Assume no targets will be supported
+
+# Check if this driver needs be built for current target
+ifeq ($(call is-board-platform,sdm845),true)
+AUDIO_SELECT  := CONFIG_SND_SOC_SDM845=m
+endif
+
+ifeq ($(call is-board-platform,sdm670),true)
+AUDIO_SELECT  := CONFIG_SND_SOC_SDM670=m
+endif
+
+AUDIO_CHIPSET := audio
+# Build/Package only in case of supported target
+ifeq ($(call is-board-platform-in-list,sdm845 sdm670),true)
+
+LOCAL_PATH := $(call my-dir)
+
+# This makefile is only for DLKM
+ifneq ($(findstring vendor,$(LOCAL_PATH)),)
+
+ifneq ($(findstring opensource,$(LOCAL_PATH)),)
+	AUDIO_BLD_DIR := $(ANDROID_BUILD_TOP)/vendor/qcom/opensource/audio-kernel
+endif # opensource
+
+DLKM_DIR := $(TOP)/device/qcom/common/dlkm
+
+# Build audio.ko as $(AUDIO_CHIPSET)_audio.ko
+###########################################################
+# This is set once per LOCAL_PATH, not per (kernel) module
+KBUILD_OPTIONS := AUDIO_ROOT=$(AUDIO_BLD_DIR)
+
+# We are actually building audio.ko here, as per the
+# requirement we are specifying <chipset>_audio.ko as LOCAL_MODULE.
+# This means we need to rename the module to <chipset>_audio.ko
+# after audio.ko is built.
+KBUILD_OPTIONS += MODNAME=native_dlkm
+KBUILD_OPTIONS += BOARD_PLATFORM=$(TARGET_BOARD_PLATFORM)
+KBUILD_OPTIONS += $(AUDIO_SELECT)
+
+###########################################################
+include $(CLEAR_VARS)
+LOCAL_MODULE              := $(AUDIO_CHIPSET)_native.ko
+LOCAL_MODULE_KBUILD_NAME  := native_dlkm.ko
+LOCAL_MODULE_TAGS         := optional
+LOCAL_MODULE_DEBUG_ENABLE := true
+LOCAL_MODULE_PATH         := $(KERNEL_MODULES_OUT)
+include $(DLKM_DIR)/AndroidKernelModule.mk
+###########################################################
+###########################################################
+
+endif # DLKM check
+endif # supported target check

dsp/codecs/Kbuild

@@ -0,0 +1,133 @@
+# We can build either as part of a standalone Kernel build or as
+# an external module.  Determine which mechanism is being used
+KERNEL_BUILD := 0
+
+
+ifeq ($(KERNEL_BUILD), 0)
+	# These are configurable via Kconfig for kernel-based builds
+	# Need to explicitly configure for Android-based builds
+	ifeq ($(CONFIG_ARCH_SDM845), y)
+		include $(AUDIO_ROOT)/config/sdm845auto.conf
+		export
+	endif
+	ifeq ($(CONFIG_ARCH_SDM670), y)
+		include $(AUDIO_ROOT)/config/sdm670auto.conf
+		export
+	endif
+endif
+
+
+# As per target team, build is done as follows:
+# Defconfig : build with default flags
+# Slub      : defconfig  + CONFIG_SLUB_DEBUG := y +
+#	      CONFIG_SLUB_DEBUG_ON := y + CONFIG_PAGE_POISONING := y
+# Perf      : Using appropriate msmXXXX-perf_defconfig
+#
+# Shipment builds (user variants) should not have any debug feature
+# enabled. This is identified using 'TARGET_BUILD_VARIANT'. Slub builds
+# are identified using the CONFIG_SLUB_DEBUG_ON configuration. Since
+# there is no other way to identify defconfig builds, QTI internal
+# representation of perf builds (identified using the string 'perf'),
+# is used to identify if the build is a slub or defconfig one. This
+# way no critical debug feature will be enabled for perf and shipment
+# builds. Other OEMs are also protected using the TARGET_BUILD_VARIANT
+# config.
+
+############ UAPI ############
+UAPI_DIR :=	uapi
+UAPI_INC :=	-I$(AUDIO_ROOT)/include/$(UAPI_DIR)
+
+############ COMMON ############
+COMMON_DIR :=	include
+COMMON_INC :=	-I$(AUDIO_ROOT)/$(COMMON_DIR)
+
+############ Native Enc/Dec ############
+
+ifeq ($(CONFIG_MSM_QDSP6V2_CODECS), m)
+	NATIVE_OBJS += q6audio_v2.o q6audio_v2_aio.o
+	NATIVE_OBJS += audio_utils_aio.o
+	NATIVE_OBJS += audio_utils.o
+	NATIVE_OBJS += audio_native.o
+	NATIVE_OBJS += aac_in.o
+	NATIVE_OBJS += amrnb_in.o
+	NATIVE_OBJS += amrwb_in.o
+	NATIVE_OBJS += audio_aac.o
+	NATIVE_OBJS += audio_alac.o
+	NATIVE_OBJS += audio_amrnb.o
+	NATIVE_OBJS += audio_amrwb.o
+	NATIVE_OBJS += audio_amrwbplus.o
+	NATIVE_OBJS += audio_ape.o
+	NATIVE_OBJS += audio_evrc.o
+	NATIVE_OBJS += audio_g711alaw.o
+	NATIVE_OBJS += audio_g711mlaw.o
+	NATIVE_OBJS += audio_hwacc_effects.o
+	NATIVE_OBJS += audio_mp3.o
+	NATIVE_OBJS += audio_multi_aac.o
+	NATIVE_OBJS += audio_qcelp.o
+	NATIVE_OBJS += audio_wma.o
+	NATIVE_OBJS += audio_wmapro.o
+	NATIVE_OBJS += evrc_in.o
+	NATIVE_OBJS += g711alaw_in.o
+	NATIVE_OBJS += g711mlaw_in.o
+	NATIVE_OBJS += qcelp_in.o
+endif
+
+LINUX_INC +=	-Iinclude/linux
+
+INCS :=		$(COMMON_INC) \
+		$(UAPI_INC)
+
+ifeq ($(CONFIG_ARCH_SDM845), y)
+INCS    +=  -include $(AUDIO_ROOT)/config/sdm845autoconf.h
+endif
+ifeq ($(CONFIG_ARCH_SDM670), y)
+INCS    +=  -include $(AUDIO_ROOT)/config/sdm670autoconf.h
+endif
+
+EXTRA_CFLAGS += $(INCS)
+
+
+CDEFINES +=	-DANI_LITTLE_BYTE_ENDIAN \
+		-DANI_LITTLE_BIT_ENDIAN \
+		-DDOT11F_LITTLE_ENDIAN_HOST \
+		-DANI_COMPILER_TYPE_GCC \
+		-DANI_OS_TYPE_ANDROID=6 \
+		-DPTT_SOCK_SVC_ENABLE \
+		-Wall\
+		-Werror\
+		-D__linux__
+
+KBUILD_CPPFLAGS += $(CDEFINES)
+
+# Currently, for versions of gcc which support it, the kernel Makefile
+# is disabling the maybe-uninitialized warning.  Re-enable it for the
+# AUDIO driver.  Note that we must use EXTRA_CFLAGS here so that it
+# will override the kernel settings.
+ifeq ($(call cc-option-yn, -Wmaybe-uninitialized),y)
+EXTRA_CFLAGS += -Wmaybe-uninitialized
+endif
+#EXTRA_CFLAGS += -Wmissing-prototypes
+
+ifeq ($(call cc-option-yn, -Wheader-guard),y)
+EXTRA_CFLAGS += -Wheader-guard
+endif
+
+KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/dsp/Module.symvers
+KBUILD_EXTRA_SYMBOLS +=$(OUT)/obj/vendor/qcom/opensource/audio-kernel/asoc/Module.symvers
+# If the module name is not "wlan", then the define MULTI_IF_NAME to be the
+# same a the QCA CHIP name. The host driver will then append MULTI_IF_NAME to
+# any string that must be unique for all instances of the driver on the system.
+# This allows multiple instances of the driver with different module names.
+# If the module name is wlan, leave MULTI_IF_NAME undefined and the code will
+# treat the driver as the primary driver.
+ifneq ($(MODNAME), qdsp6v2)
+CHIP_NAME ?= $(MODNAME)
+CDEFINES += -DMULTI_IF_NAME=\"$(CHIP_NAME)\"
+endif
+
+# Module information used by KBuild framework
+obj-$(CONFIG_MSM_QDSP6V2_CODECS) += native_dlkm.o
+native_dlkm-y := $(NATIVE_OBJS)
+
+# inject some build related information
+DEFINES += -DBUILD_TIMESTAMP=\"$(shell date -u +'%Y-%m-%dT%H:%M:%SZ')\"

dsp/codecs/aac_in.c

@@ -702,8 +702,12 @@ struct miscdevice audio_aac_in_misc = {
 	.fops	= &audio_in_fops,
 };
 
-static int __init aac_in_init(void)
+int __init aac_in_init(void)
 {
 	return misc_register(&audio_aac_in_misc);
 }
-device_initcall(aac_in_init);
+
+void __exit aac_in_exit(void)
+{
+	misc_deregister(&audio_aac_in_misc);
+}

dsp/codecs/amrnb_in.c

@@ -394,9 +394,12 @@ struct miscdevice audio_amrnb_in_misc = {
 	.fops	= &audio_in_fops,
 };
 
-static int __init amrnb_in_init(void)
+int __init amrnb_in_init(void)
 {
 	return misc_register(&audio_amrnb_in_misc);
 }
 
-device_initcall(amrnb_in_init);
+void __exit amrnb_in_exit(void)
+{
+	misc_deregister(&audio_amrnb_in_misc);
+}

dsp/codecs/amrwb_in.c

@@ -392,9 +392,12 @@ struct miscdevice audio_amrwb_in_misc = {
 	.fops	= &audio_in_fops,
 };
 
-static int __init amrwb_in_init(void)
+int __init amrwb_in_init(void)
 {
 	return misc_register(&audio_amrwb_in_misc);
 }
 
-device_initcall(amrwb_in_init);
+void __exit amrwb_in_exit(void)
+{
+	misc_deregister(&audio_amrwb_in_misc);
+}

dsp/codecs/audio_aac.c

@@ -461,7 +461,7 @@ static struct miscdevice audio_aac_misc = {
 	.fops = &audio_aac_fops,
 };
 
-static int __init audio_aac_init(void)
+int __init audio_aac_init(void)
 {
 	int ret = misc_register(&audio_aac_misc);
 
@@ -473,4 +473,8 @@ static int __init audio_aac_init(void)
 	return ret;
 }
 
-device_initcall(audio_aac_init);
+void __exit audio_aac_exit(void)
+{
+	mutex_destroy(&audio_aac_ws_mgr.ws_lock);
+	misc_deregister(&audio_aac_misc);
+}

dsp/codecs/audio_alac.c

@@ -420,7 +420,7 @@ static struct miscdevice audio_alac_misc = {
 	.fops = &audio_alac_fops,
 };
 
-static int __init audio_alac_init(void)
+int __init audio_alac_init(void)
 {
 	int ret = misc_register(&audio_alac_misc);
 
@@ -432,4 +432,8 @@ static int __init audio_alac_init(void)
 	return ret;
 }
 
-device_initcall(audio_alac_init);
+void __exit audio_alac_exit(void)
+{
+	mutex_destroy(&audio_alac_ws_mgr.ws_lock);
+	misc_deregister(&audio_alac_misc);
+}

dsp/codecs/audio_amrnb.c

@@ -211,7 +211,7 @@ static struct miscdevice audio_amrnb_misc = {
 	.fops = &audio_amrnb_fops,
 };
 
-static int __init audio_amrnb_init(void)
+int __init audio_amrnb_init(void)
 {
 	int ret = misc_register(&audio_amrnb_misc);
 
@@ -223,4 +223,8 @@ static int __init audio_amrnb_init(void)
 	return ret;
 }
 
-device_initcall(audio_amrnb_init);
+void __exit audio_amrnb_exit(void)
+{
+	mutex_destroy(&audio_amrnb_ws_mgr.ws_lock);
+	misc_deregister(&audio_amrnb_misc);
+}

dsp/codecs/audio_amrwb.c

@@ -216,7 +216,7 @@ static struct miscdevice audio_amrwb_misc = {
 	.fops = &audio_amrwb_fops,
 };
 
-static int __init audio_amrwb_init(void)
+int __init audio_amrwb_init(void)
 {
 	int ret = misc_register(&audio_amrwb_misc);
 
@@ -228,4 +228,8 @@ static int __init audio_amrwb_init(void)
 	return ret;
 }
 
-device_initcall(audio_amrwb_init);
+void __exit audio_amrwb_exit(void)
+{
+	mutex_destroy(&audio_amrwb_ws_mgr.ws_lock);
+	misc_deregister(&audio_amrwb_misc);
+}

dsp/codecs/audio_amrwbplus.c

@@ -382,7 +382,7 @@ static struct miscdevice audio_amrwbplus_misc = {
 	.fops = &audio_amrwbplus_fops,
 };
 
-static int __init audio_amrwbplus_init(void)
+int __init audio_amrwbplus_init(void)
 {
 	int ret = misc_register(&audio_amrwbplus_misc);
 
@@ -394,4 +394,8 @@ static int __init audio_amrwbplus_init(void)
 	return ret;
 }
 
-device_initcall(audio_amrwbplus_init);
+void __exit audio_amrwbplus_exit(void)
+{
+	mutex_destroy(&audio_amrwbplus_ws_mgr.ws_lock);
+	misc_deregister(&audio_amrwbplus_misc);
+}

dsp/codecs/audio_ape.c

@@ -344,7 +344,7 @@ static struct miscdevice audio_ape_misc = {
 	.fops = &audio_ape_fops,
 };
 
-static int __init audio_ape_init(void)
+int __init audio_ape_init(void)
 {
 	int ret = misc_register(&audio_ape_misc);
 
@@ -356,4 +356,8 @@ static int __init audio_ape_init(void)
 	return ret;
 }
 
-device_initcall(audio_ape_init);
+void __exit audio_ape_exit(void)
+{
+	mutex_destroy(&audio_ape_ws_mgr.ws_lock);
+	misc_deregister(&audio_ape_misc);
+}

dsp/codecs/audio_evrc.c

@@ -169,7 +169,7 @@ static struct miscdevice audio_evrc_misc = {
 	.fops = &audio_evrc_fops,
 };
 
-static int __init audio_evrc_init(void)
+int __init audio_evrc_init(void)
 {
 	int ret = misc_register(&audio_evrc_misc);
 
@@ -181,4 +181,8 @@ static int __init audio_evrc_init(void)
 	return ret;
 }
 
-device_initcall(audio_evrc_init);
+void __exit audio_evrc_exit(void)
+{
+	mutex_destroy(&audio_evrc_ws_mgr.ws_lock);
+	misc_deregister(&audio_evrc_misc);
+}

dsp/codecs/audio_g711alaw.c

@@ -375,7 +375,7 @@ static struct miscdevice audio_g711alaw_misc = {
 	.fops = &audio_g711_fops,
 };
 
-static int __init audio_g711alaw_init(void)
+int __init audio_g711alaw_init(void)
 {
 	int ret = misc_register(&audio_g711alaw_misc);
 
@@ -386,11 +386,9 @@ static int __init audio_g711alaw_init(void)
 
 	return ret;
 }
-static void __exit audio_g711alaw_exit(void)
-{
-	misc_deregister(&audio_g711alaw_misc);
-	mutex_destroy(&audio_g711_ws_mgr.ws_lock);
-}
 
-device_initcall(audio_g711alaw_init);
-__exitcall(audio_g711alaw_exit);
+void __exit audio_g711alaw_exit(void)
+{
+	mutex_destroy(&audio_g711_ws_mgr.ws_lock);
+	misc_deregister(&audio_g711alaw_misc);
+}

dsp/codecs/audio_g711mlaw.c

@@ -374,7 +374,7 @@ static struct miscdevice audio_g711mlaw_misc = {
 	.fops = &audio_g711_fops,
 };
 
-static int __init audio_g711mlaw_init(void)
+int __init audio_g711mlaw_init(void)
 {
 	int ret = misc_register(&audio_g711mlaw_misc);
 
@@ -386,11 +386,9 @@ static int __init audio_g711mlaw_init(void)
 	return ret;
 }
 
-static void __exit audio_g711mlaw_exit(void)
+void __exit audio_g711mlaw_exit(void)
 {
-	misc_deregister(&audio_g711mlaw_misc);
 	mutex_destroy(&audio_g711_ws_mgr.ws_lock);
+	misc_deregister(&audio_g711mlaw_misc);
 }
 
-device_initcall(audio_g711mlaw_init);
-__exitcall(audio_g711mlaw_exit);

dsp/codecs/audio_hwacc_effects.c

@@ -768,11 +768,15 @@ struct miscdevice audio_effects_misc = {
 	.fops = &audio_effects_fops,
 };
 
-static int __init audio_effects_init(void)
+int __init audio_effects_init(void)
 {
 	return misc_register(&audio_effects_misc);
 }
 
-device_initcall(audio_effects_init);
+void __exit audio_effects_exit(void)
+{
+	misc_deregister(&audio_effects_misc);
+}
+
 MODULE_DESCRIPTION("Audio hardware accelerated effects driver");
 MODULE_LICENSE("GPL v2");

dsp/codecs/audio_mp3.c

@@ -173,7 +173,7 @@ static struct miscdevice audio_mp3_misc = {
 	.fops = &audio_mp3_fops,
 };
 
-static int __init audio_mp3_init(void)
+int __init audio_mp3_init(void)
 {
 	int ret = misc_register(&audio_mp3_misc);
 
@@ -185,4 +185,8 @@ static int __init audio_mp3_init(void)
 	return ret;
 }
 
-device_initcall(audio_mp3_init);
+void __exit audio_mp3_exit(void)
+{
+	mutex_destroy(&audio_mp3_ws_mgr.ws_lock);
+	misc_deregister(&audio_mp3_misc);
+}

dsp/codecs/audio_multi_aac.c

@@ -508,7 +508,7 @@ static struct miscdevice audio_multiaac_misc = {
 	.fops = &audio_aac_fops,
 };
 
-static int __init audio_aac_init(void)
+int __init audio_multiaac_init(void)
 {
 	int ret = misc_register(&audio_multiaac_misc);
 
@@ -520,4 +520,8 @@ static int __init audio_aac_init(void)
 	return ret;
 }
 
-device_initcall(audio_aac_init);
+void __exit audio_multiaac_exit(void)
+{
+	mutex_destroy(&audio_multiaac_ws_mgr.ws_lock);
+	misc_deregister(&audio_multiaac_misc);
+}

dsp/codecs/audio_native.c

@@ -0,0 +1,75 @@
+/*
+Copyright (c) 2017, The Linux Foundation. All rights reserved.
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 2 and
+only version 2 as published by the Free Software Foundation.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+*
+*/
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include "audio_utils.h"
+
+static int __init audio_native_init(void)
+{
+	aac_in_init();
+	amrnb_in_init();
+	amrwb_in_init();
+	audio_aac_init();
+	audio_alac_init();
+	audio_amrnb_init();
+	audio_amrwb_init();
+	audio_amrwbplus_init();
+	audio_ape_init();
+	audio_evrc_init();
+	audio_g711alaw_init();
+	audio_g711mlaw_init();
+	audio_effects_init();
+	audio_mp3_init();
+	audio_multiaac_init();
+	audio_qcelp_init();
+	audio_wma_init();
+	audio_wmapro_init();
+	evrc_in_init();
+	g711alaw_in_init();
+	g711mlaw_in_init();
+	qcelp_in_init();
+	return 0;
+}
+
+static void __exit audio_native_exit(void)
+{
+	aac_in_exit();
+	amrnb_in_exit();
+	amrwb_in_exit();
+	audio_aac_exit();
+	audio_alac_exit();
+	audio_amrnb_exit();
+	audio_amrwb_exit();
+	audio_amrwbplus_exit();
+	audio_ape_exit();
+	audio_evrc_exit();
+	audio_g711alaw_exit();
+	audio_g711mlaw_exit();
+	audio_effects_exit();
+	audio_mp3_exit();
+	audio_multiaac_exit();
+	audio_qcelp_exit();
+	audio_wma_exit();
+	audio_wmapro_exit();
+	evrc_in_exit();
+	g711alaw_in_exit();
+	g711mlaw_in_exit();
+	qcelp_in_exit();
+}
+
+module_init(audio_native_init);
+module_exit(audio_native_exit);
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("Native Encoder/Decoder module");

dsp/codecs/audio_qcelp.c

@@ -176,7 +176,7 @@ static struct miscdevice audio_qcelp_misc = {
 	.fops = &audio_qcelp_fops,
 };
 
-static int __init audio_qcelp_init(void)
+int audio_qcelp_init(void)
 {
 	int ret = misc_register(&audio_qcelp_misc);
 
@@ -188,4 +188,8 @@ static int __init audio_qcelp_init(void)
 	return ret;
 }
 
-device_initcall(audio_qcelp_init);
+void __exit audio_qcelp_exit(void)
+{
+	mutex_destroy(&audio_qcelp_ws_mgr.ws_lock);
+	misc_deregister(&audio_qcelp_misc);
+}

dsp/codecs/audio_utils.h

@@ -112,3 +112,47 @@ ssize_t audio_in_write(struct file *file, const char __user *buf,
 		size_t count, loff_t *pos);
 int audio_in_release(struct inode *inode, struct file *file);
 int audio_in_set_config(struct file *file, struct msm_audio_config *cfg);
+int aac_in_init(void);
+int amrnb_in_init(void);
+int amrwb_in_init(void);
+int audio_aac_init(void);
+int audio_alac_init(void);
+int audio_amrnb_init(void);
+int audio_amrwb_init(void);
+int audio_amrwbplus_init(void);
+int audio_ape_init(void);
+int audio_evrc_init(void);
+int audio_g711alaw_init(void);
+int audio_g711mlaw_init(void);
+int audio_effects_init(void);
+int audio_mp3_init(void);
+int audio_multiaac_init(void);
+int audio_qcelp_init(void);
+int audio_wma_init(void);
+int audio_wmapro_init(void);
+int evrc_in_init(void);
+int g711alaw_in_init(void);
+int g711mlaw_in_init(void);
+int qcelp_in_init(void);
+void aac_in_exit(void);
+void amrnb_in_exit(void);
+void amrwb_in_exit(void);
+void audio_aac_exit(void);
+void audio_alac_exit(void);
+void audio_amrnb_exit(void);
+void audio_amrwb_exit(void);
+void audio_amrwbplus_exit(void);
+void audio_ape_exit(void);
+void audio_evrc_exit(void);
+void audio_g711alaw_exit(void);
+void audio_g711mlaw_exit(void);
+void audio_effects_exit(void);
+void audio_mp3_exit(void);
+void audio_multiaac_exit(void);
+void audio_qcelp_exit(void);
+void audio_wma_exit(void);
+void audio_wmapro_exit(void);
+void evrc_in_exit(void);
+void g711alaw_in_exit(void);
+void g711mlaw_in_exit(void);
+void qcelp_in_exit(void);

dsp/codecs/audio_wma.c

@@ -330,7 +330,7 @@ static struct miscdevice audio_wma_misc = {
 	.fops = &audio_wma_fops,
 };
 
-static int __init audio_wma_init(void)
+int __init audio_wma_init(void)
 {
 	int ret = misc_register(&audio_wma_misc);
 
@@ -342,4 +342,8 @@ static int __init audio_wma_init(void)
 	return ret;
 }
 
-device_initcall(audio_wma_init);
+void __exit audio_wma_exit(void)
+{
+	mutex_destroy(&audio_wma_ws_mgr.ws_lock);
+	misc_deregister(&audio_wma_misc);
+}

dsp/codecs/audio_wmapro.c

@@ -403,7 +403,7 @@ static struct miscdevice audio_wmapro_misc = {
 	.fops = &audio_wmapro_fops,
 };
 
-static int __init audio_wmapro_init(void)
+int __init audio_wmapro_init(void)
 {
 	int ret = misc_register(&audio_wmapro_misc);
 
@@ -415,4 +415,8 @@ static int __init audio_wmapro_init(void)
 	return ret;
 }
 
-device_initcall(audio_wmapro_init);
+void __exit audio_wmapro_exit(void)
+{
+	mutex_destroy(&audio_wmapro_ws_mgr.ws_lock);
+	misc_deregister(&audio_wmapro_misc);
+}

dsp/codecs/evrc_in.c

@@ -402,9 +402,12 @@ struct miscdevice audio_evrc_in_misc = {
 	.fops	= &audio_in_fops,
 };
 
-static int __init evrc_in_init(void)
+int __init evrc_in_init(void)
 {
 	return misc_register(&audio_evrc_in_misc);
 }
 
-device_initcall(evrc_in_init);
+void __exit evrc_in_exit(void)
+{
+	misc_deregister(&audio_evrc_in_misc);
+}

dsp/codecs/g711alaw_in.c

@@ -374,9 +374,12 @@ struct miscdevice audio_g711alaw_in_misc = {
 	.fops	= &audio_in_fops,
 };
 
-static int __init g711alaw_in_init(void)
+int __init g711alaw_in_init(void)
 {
 	return misc_register(&audio_g711alaw_in_misc);
 }
 
-device_initcall(g711alaw_in_init);
+void __exit g711alaw_in_exit(void)
+{
+	misc_deregister(&audio_g711alaw_in_misc);
+}

dsp/codecs/g711mlaw_in.c

@@ -377,9 +377,12 @@ struct miscdevice audio_g711mlaw_in_misc = {
 	.fops	= &audio_in_fops,
 };
 
-static int __init g711mlaw_in_init(void)
+int __init g711mlaw_in_init(void)
 {
 	return misc_register(&audio_g711mlaw_in_misc);
 }
 
-device_initcall(g711mlaw_in_init);
+void __exit g711mlaw_in_exit(void)
+{
+	misc_deregister(&audio_g711mlaw_in_misc);
+}

dsp/codecs/qcelp_in.c

@@ -402,9 +402,12 @@ struct miscdevice audio_qcelp_in_misc = {
 	.fops	= &audio_in_fops,
 };
 
-static int __init qcelp_in_init(void)
+int __init qcelp_in_init(void)
 {
 	return misc_register(&audio_qcelp_in_misc);
 }
 
-device_initcall(qcelp_in_init);
+void __exit qcelp_in_exit(void)
+{
+	misc_deregister(&audio_qcelp_in_misc);
+}