From 83de6016682dfdf73bac5820e5a89f90ea1b3bfb Mon Sep 17 00:00:00 2001 From: Luca Clementi Date: Wed, 21 Nov 2012 19:43:17 -0800 Subject: [PATCH] Staging: Android: logger: module_exit implementation This patch creates the module_exit for the android logger so that it can be loaded and unloaded as a module. The android logger is already declared as a tristate in the Kconfig but the module_exit function was missing. device_initcall works also with modprobe since include/linux/init.h: #define module_init(x) __initcall(x); ... #define __initcall(fn) device_initcall(fn) Tested against f4a75d2eb7b1e2206094b901be09adb31ba63681 Linux 3.7-rc6 Signed-off-by: Luca Clementi Cc: Brian Swetland Cc: Robert Love Signed-off-by: Greg Kroah-Hartman --- drivers/staging/android/logger.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/drivers/staging/android/logger.c b/drivers/staging/android/logger.c index 1d5ed47..dbc63cb 100644 --- a/drivers/staging/android/logger.c +++ b/drivers/staging/android/logger.c @@ -676,4 +676,25 @@ static int __init logger_init(void) out: return ret; } + +static void __exit logger_exit(void) +{ + struct logger_log *current_log, *next_log; + + list_for_each_entry_safe(current_log, next_log, &log_list, logs) { + /* we have to delete all the entry inside log_list */ + misc_deregister(¤t_log->misc); + vfree(current_log->buffer); + kfree(current_log->misc.name); + list_del(¤t_log->logs); + kfree(current_log); + } +} + + device_initcall(logger_init); +module_exit(logger_exit); + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Robert Love, "); +MODULE_DESCRIPTION("Android Logger"); -- 2.7.4