Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
---
drivers/staging/stlc45xx/stlc45xx.c | 2 ++
drivers/staging/stlc45xx/stlc45xx.h | 13 ++++---------
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/drivers/staging/stlc45xx/stlc45xx.c b/drivers/staging/stlc45xx/stlc45xx.c
index be99eb3..697d8ee 100644
--- a/drivers/staging/stlc45xx/stlc45xx.c
+++ b/drivers/staging/stlc45xx/stlc45xx.c
@@ -21,6 +21,8 @@
*
*/
+#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+
#include "stlc45xx.h"
#include <linux/module.h>
diff --git a/drivers/staging/stlc45xx/stlc45xx.h b/drivers/staging/stlc45xx/stlc45xx.h
index ac96bbb..705fa29 100644
--- a/drivers/staging/stlc45xx/stlc45xx.h
+++ b/drivers/staging/stlc45xx/stlc45xx.h
@@ -30,8 +30,6 @@
#define DRIVER_NAME "stlc45xx"
#define DRIVER_VERSION "0.1.3"
-#define DRIVER_PREFIX DRIVER_NAME ": "
-
enum {
DEBUG_NONE = 0,
DEBUG_FUNC = 1 << 0,
@@ -55,18 +53,18 @@ enum {
/* #define DEBUG_LEVEL (DEBUG_MEMREGION | DEBUG_QUEUE) */
#define stlc45xx_error(fmt, arg...) \
- printk(KERN_ERR DRIVER_PREFIX "ERROR " fmt "\n", ##arg)
+ pr_err("ERROR " fmt "\n", ##arg)
#define stlc45xx_warning(fmt, arg...) \
- printk(KERN_WARNING DRIVER_PREFIX "WARNING " fmt "\n", ##arg)
+ pr_warning("WARNING " fmt "\n", ##arg)
#define stlc45xx_info(fmt, arg...) \
- printk(KERN_INFO DRIVER_PREFIX fmt "\n", ##arg)
+ pr_info(fmt "\n", ##arg)
#define stlc45xx_debug(level, fmt, arg...) \
do { \
if (level & DEBUG_LEVEL) \
- printk(KERN_DEBUG DRIVER_PREFIX fmt "\n", ##arg); \
+ printk(KERN_DEBUG pr_fmt(fmt "\n"), ##arg); \
} while (0)
#define stlc45xx_dump(level, buf, len) \
@@ -76,9 +74,6 @@ enum {
16, 1, buf, len, 1); \
} while (0)
-#define MAC2STR(a) ((a)[0], (a)[1], (a)[2], (a)[3], (a)[4], (a)[5])
-#define MACSTR "%02x:%02x:%02x:%02x:%02x:%02x"
-
/* Bit 15 is read/write bit; ON = READ, OFF = WRITE */
#define ADDR_READ_BIT_15 0x8000
--
1.6.5.rc3.dirty
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
