Signed-off-by: Joe Perches <joe@xxxxxxxxxxx>
---
drivers/staging/hv/logging.h | 12 ++++++------
drivers/staging/hv/osd.c | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/hv/logging.h b/drivers/staging/hv/logging.h
index 9e55617..cb74f0d 100644
--- a/drivers/staging/hv/logging.h
+++ b/drivers/staging/hv/logging.h
@@ -63,8 +63,8 @@ extern unsigned int vmbus_loglevel;
#define ASSERT(expr) \
if (!(expr)) { \
- printk(KERN_CRIT "Assertion failed! %s,%s,%s,line=%d\n", \
- #expr, __FILE__, __func__, __LINE__); \
+ pr_crit("Assertion failed! %s,%s,%s,line=%d\n", \
+ #expr, __FILE__, __func__, __LINE__); \
__asm__ __volatile__("int3"); \
}
@@ -83,20 +83,20 @@ extern unsigned int vmbus_loglevel;
#define DPRINT_INFO(mod, fmt, args...) do {\
if ((mod & (HIWORD(vmbus_loglevel))) && \
(INFO_LVL <= LOWORD(vmbus_loglevel))) \
- printk(KERN_INFO #mod": " fmt "\n", ## args);\
+ pr_info(#mod": " fmt "\n", ## args); \
} while (0)
#define DPRINT_WARN(mod, fmt, args...) do {\
if ((mod & (HIWORD(vmbus_loglevel))) && \
(WARNING_LVL <= LOWORD(vmbus_loglevel))) \
- printk(KERN_WARNING #mod": WARNING! " fmt "\n", ## args);\
+ pr_warning(#mod": WARNING! " fmt "\n", ## args); \
} while (0)
#define DPRINT_ERR(mod, fmt, args...) do {\
if ((mod & (HIWORD(vmbus_loglevel))) && \
(ERROR_LVL <= LOWORD(vmbus_loglevel))) \
- printk(KERN_ERR #mod": %s() ERROR!! " fmt "\n", \
- __func__, ## args);\
+ pr_err(#mod": %s() ERROR!! " fmt "\n", \
+ __func__, ## args); \
} while (0)
#ifdef DEBUG
diff --git a/drivers/staging/hv/osd.c b/drivers/staging/hv/osd.c
index 8fe543b..5084d51 100644
--- a/drivers/staging/hv/osd.c
+++ b/drivers/staging/hv/osd.c
@@ -144,7 +144,7 @@ int osd_schedule_callback(struct workqueue_struct *wq,
cb = kmalloc(sizeof(*cb), GFP_KERNEL);
if (!cb) {
- printk(KERN_ERR "unable to allocate memory in osd_schedule_callback\n");
+ pr_err("unable to allocate memory in osd_schedule_callback\n");
return -1;
}
--
1.6.5.rc3.dirty
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
