| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Tue, 25 Jun 2013 17:30:02 +0100
From: Rupesh Gujare <rupesh.gujare@...el.com>
To: <devel@...uxdriverproject.org>
CC: <linux-usb@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
<gregkh@...uxfoundation.org>, <shigekatsu.tateno@...el.com>
Subject: [PATCH] staging: ozwpan: Convert printk to dev_dbg()
convert all debug messages from printk to dev_dbg() & add kernel config to
enable/disable these messages during compilation.
Signed-off-by: Rupesh Gujare <rupesh.gujare@...el.com>
---
drivers/staging/ozwpan/Kbuild | 2 +-
drivers/staging/ozwpan/Kconfig | 9 +++++++++
drivers/staging/ozwpan/ozcdev.c | 9 +++++----
drivers/staging/ozwpan/oztrace.h | 9 +++++----
4 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/ozwpan/Kbuild b/drivers/staging/ozwpan/Kbuild
index 1766a26..35a4278 100644
--- a/drivers/staging/ozwpan/Kbuild
+++ b/drivers/staging/ozwpan/Kbuild
@@ -15,4 +15,4 @@ ozwpan-y := \
ozurbparanoia.o \
oztrace.o
-
+ccflags-$(CONFIG_USB_WPAN_HCD_DEBUG) := -DDEBUG -DWANT_TRACE
diff --git a/drivers/staging/ozwpan/Kconfig b/drivers/staging/ozwpan/Kconfig
index 7904cae..ccee97c 100644
--- a/drivers/staging/ozwpan/Kconfig
+++ b/drivers/staging/ozwpan/Kconfig
@@ -7,3 +7,12 @@ config USB_WPAN_HCD
To compile this driver a module, choose M here: the module
will be called "ozwpan".
+
+if USB_WPAN_HCD
+
+config USB_WPAN_HCD_DEBUG
+ boolean "Debug support for USB over WiFi Host Controller"
+ help
+ Say "yes" to enable debug messages.
+
+endif # USB_WPAN_HCD
diff --git a/drivers/staging/ozwpan/ozcdev.c b/drivers/staging/ozwpan/ozcdev.c
index 374fdc3..2fc944b 100644
--- a/drivers/staging/ozwpan/ozcdev.c
+++ b/drivers/staging/ozwpan/ozcdev.c
@@ -44,6 +44,7 @@ struct oz_serial_ctx {
*/
static struct oz_cdev g_cdev;
static struct class *g_oz_class;
+struct device *g_oz_wpan_dev;
/*------------------------------------------------------------------------------
* Context: process and softirq
*/
@@ -334,7 +335,6 @@ static const struct file_operations oz_fops = {
int oz_cdev_register(void)
{
int err;
- struct device *dev;
memset(&g_cdev, 0, sizeof(g_cdev));
err = alloc_chrdev_region(&g_cdev.devnum, 0, 1, "ozwpan");
if (err < 0)
@@ -357,10 +357,11 @@ int oz_cdev_register(void)
err = PTR_ERR(g_oz_class);
goto out1;
}
- dev = device_create(g_oz_class, NULL, g_cdev.devnum, NULL, "ozwpan");
- if (IS_ERR(dev)) {
+ g_oz_wpan_dev = device_create(g_oz_class, NULL, g_cdev.devnum, NULL,
+ "ozwpan");
+ if (IS_ERR(g_oz_wpan_dev)) {
oz_trace("Failed to create sysfs entry for cdev\n");
- err = PTR_ERR(dev);
+ err = PTR_ERR(g_oz_wpan_dev);
goto out1;
}
return 0;
diff --git a/drivers/staging/ozwpan/oztrace.h b/drivers/staging/ozwpan/oztrace.h
index 8293b24..8764f37 100644
--- a/drivers/staging/ozwpan/oztrace.h
+++ b/drivers/staging/ozwpan/oztrace.h
@@ -7,14 +7,15 @@
#define _OZTRACE_H_
#include "ozconfig.h"
-#define TRACE_PREFIX KERN_ALERT "OZWPAN: "
+extern struct device *g_oz_wpan_dev;
#ifdef WANT_TRACE
-#define oz_trace(...) printk(TRACE_PREFIX __VA_ARGS__)
+#define oz_trace(fmt, ...) dev_dbg(g_oz_wpan_dev, fmt, ##__VA_ARGS__);
#ifdef WANT_VERBOSE_TRACE
extern unsigned long trace_flags;
-#define oz_trace2(_flag, ...) \
- do { if (trace_flags & _flag) printk(TRACE_PREFIX __VA_ARGS__); \
+#define oz_trace2(_flag, fmt, ...) \
+ do { if (trace_flags & _flag) \
+ dev_dbg(g_oz_wpan_dev, fmt, ##__VA_ARGS__); \
} while (0)
#else
#define oz_trace2(...)
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists