writer: replace printk() by pr_*()

Change-Id: I3ba7a526ef156eb9c5ced9392eea0705655cf816
Signed-off-by: Vyacheslav Cherkashin <v.cherkashin@samsung.com>

diff --git a/writer/kernel_operations.h b/writer/kernel_operations.h
index a5014e7..f7f312b 100644 (file)
--- a/writer/kernel_operations.h
+++ b/writer/kernel_operations.h
@@ -36,23 +36,6 @@
 #include <linux/uaccess.h>
 #include <asm/ptrace.h>
 
-/* MESSAGES */
-
-/** Prints debug message.*/
-#define print_debug(msg, args...) \
-       printk(KERN_DEBUG "SWAP_WRITER DEBUG : " msg, ##args)
-/** Prints info message.*/
-#define print_msg(msg, args...)   \
-       printk(KERN_INFO "SWAP_WRITER : " msg, ##args)
-/** Prints warning message.*/
-#define print_warn(msg, args...)  \
-       printk(KERN_WARNING "SWAP_WRITER WARNING : " msg, ##args)
-/** Prints error message.*/
-#define print_err(msg, args...)   \
-       printk(KERN_ERR "SWAP_WRITER ERROR : " msg, ##args)
-/** Prints critical error message.*/
-#define print_crit(msg, args...)  \
-       printk(KERN_CRIT "SWAP_WRITER CRITICAL : " msg, ##args)
 
 /* ARCH-DEPENDED OPERATIONS */
 
@@ -78,8 +61,8 @@ static inline u32 get_regs_ret_func(struct pt_regs *regs)
        if (user_mode(regs)) {
                sp = (u32 *)regs->sp;
                if (get_user(addr, sp))
-                       printk(KERN_INFO "failed to dereference a pointer, sp=%p, "
-                              "pc=%lx\n", sp, get_regs_ip(regs));
+                       pr_info("failed to dereference a pointer, sp=%p, "
+                               "pc=%lx\n", sp, get_regs_ip(regs));
        } else {
                sp = (u32 *)kernel_stack_pointer(regs);
                addr = *sp;

diff --git a/writer/swap_msg.c b/writer/swap_msg.c
index f915f6e..025f9a4 100644 (file)
--- a/writer/swap_msg.c
+++ b/writer/swap_msg.c
@@ -33,7 +33,7 @@
 #include "swap_msg.h"
 
 
-#define MSG_PREFIX      KERN_INFO "[SWAP_MSG] "
+#define MSG_PREFIX     "[SWAP_MSG] "
 
 
 struct swap_msg {
@@ -347,12 +347,12 @@ int swap_msg_raw(void *data, size_t size)
        struct swap_msg *m = (struct swap_msg *)data;
 
        if (sizeof(*m) > size) {
-               printk(MSG_PREFIX "ERROR: message RAW small size=%u\n", size);
+               pr_err(MSG_PREFIX "ERROR: message RAW small size=%u\n", size);
                return -EINVAL;
        }
 
        if (m->len + sizeof(*m) != size) {
-               printk(MSG_PREFIX "ERROR: message RAW wrong format\n");
+               pr_err(MSG_PREFIX "ERROR: message RAW wrong format\n");
                return -EINVAL;
        }
 
@@ -383,7 +383,7 @@ void swap_msg_error(const char *fmt, ...)
        va_end(args);
 
        if (ret <= 0) {
-               printk(MSG_PREFIX "ERROR: msg error packing, ret=%d\n", ret);
+               pr_err(MSG_PREFIX "ERROR: msg error packing, ret=%d\n", ret);
                goto put_msg;
        }