Staging: slicoss: remove SLICLEVEL and SLIC_DISPLAY macros

They aren't needed or used anymore.

Cc: Lior Dotan <liodot@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/slicoss/slicdbg.h b/drivers/staging/slicoss/slicdbg.h
index 6298a5a8a38fa64ae2aa4ae2b7bc836bb680b1f8..12a91d70ffe72516ca0b0e9aa20826fe4a577fd7 100644 (file)
--- a/drivers/staging/slicoss/slicdbg.h
+++ b/drivers/staging/slicoss/slicdbg.h
@@ -42,12 +42,7 @@
 #ifndef _SLIC_DEBUG_H_
 #define _SLIC_DEBUG_H_
 
-#ifdef SLIC_DEFAULT_LOG_LEVEL
-#else
-#define SLICLEVEL   KERN_DEBUG
-#endif
-#define SLIC_DISPLAY              printk
-#define DBG_ERROR(n, args...)   SLIC_DISPLAY(KERN_EMERG n, ##args)
+#define DBG_ERROR(n, args...)  printk(KERN_EMERG n, ##args)
 
 #ifdef ASSERT
 #undef ASSERT

diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
index ddd8e9c892f559a0491ca2cc1bdef2d0553cd172..b670c5e1fe03fce1360f57e6a306ccfc514449d9 100644 (file)
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
@@ -4042,7 +4042,8 @@ static int __init slic_module_init(void)
        slic_init_driver();
 
        if (debug >= 0 && slic_debug != debug)
-               printk(SLICLEVEL "slicoss: debug level is %d.\n", debug);
+               printk(KERN_DEBUG KBUILD_MODNAME ": debug level is %d.\n",
+                      debug);
        if (debug >= 0)
                slic_debug = debug;