summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2009-02-26 14:56:25 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2009-04-03 14:53:08 -0700
commite5bac59803550c490f292391f7877107fd24107a (patch)
tree39871e44bc26089f287c5004990f28f603de46a5
parente52011e4761938632a926e8518834a8f66918f26 (diff)
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>
-rw-r--r--drivers/staging/slicoss/slicdbg.h7
-rw-r--r--drivers/staging/slicoss/slicoss.c3
2 files changed, 3 insertions, 7 deletions
diff --git a/drivers/staging/slicoss/slicdbg.h b/drivers/staging/slicoss/slicdbg.h
index 6298a5a8a38f..12a91d70ffe7 100644
--- 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 ddd8e9c892f5..b670c5e1fe03 100644
--- 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;