SYSLINK: SysLink printks with pr_xxx

SYSLINK: IPC-replace printks with pr_xxx

Replace
printk(KERN_ERR) with pr_err
printk(KERN_INFO) with pr_info
printk(KERN_WARNING) with pr_info

Change-Id: Ic434b3ca34f131528c71f8f3fc6b5b51252db92c
Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com>

SYSLINK: notify-replace printks with pr_xxx

Replace
    printk(KERN_ERR) with pr_err
    printk(KERN_INFO) with pr_info
    printk(KERN_WARNING) with pr_info

Change-Id: Iad946fec668a2fa190ea4c54067f59378cb6f147
Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com>

SYSLINK: notify-ducati-replace printks with pr_xxx

Replace
        printk(KERN_ERR) with pr_err
        printk(KERN_INFO) with pr_info
        printk(KERN_WARNING) with pr_info

Change-Id: Ic65782b709447033912a7b3fe76daa3548b1ad4c
Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com>

SYSLINK: PROCMGR-replace printks with pr_xxx

Replace
    printk(KERN_ERR) with pr_err
    printk(KERN_INFO) with pr_info
    printk(KERN_WARNING) with pr_info

Change-Id: Iee8c0a38dbb32dc33b42d4ba757a746f791a3047
Signed-off-by: Hari Kanigeri <h-kanigeri2@ti.com>

30 files changed, 578 insertions, 751 deletions

diff --git a/drivers/dsp/syslink/multicore_ipc/gatehwspinlock.c b/drivers/dsp/syslink/multicore_ipc/gatehwspinlock.c
index c0076dffe4f..57b53ad050e 100644
--- a/drivers/dsp/syslink/multicore_ipc/gatehwspinlock.c
+++ b/drivers/dsp/syslink/multicore_ipc/gatehwspinlock.c
@@ -183,7 +183,7 @@ int gatehwspinlock_setup(const struct gatehwspinlock_config *config)
 			lock_handle = hwspinlock_request_specific(i);
 			if (lock_handle == NULL) {
 				retval = -EBUSY;
-				printk(KERN_ERR "hwspinlock_request failed for"
+				pr_err("hwspinlock_request failed for"
 					"id = %d", i);
 				goto spinlock_request_fail;
 			}
@@ -200,8 +200,7 @@ exit:
 	kfree(gatehwspinlock_module->hw_lock_handles);
 	atomic_dec_return(&gatehwspinlock_module->ref_count);
 	if (retval < 0)
-		printk(KERN_ERR "gatehwspinlock_setup failed! status = 0x%x",
-			retval);
+		pr_err("gatehwspinlock_setup failed! status = 0x%x", retval);
 	return retval;
 }
 EXPORT_SYMBOL(gatehwspinlock_setup);
@@ -240,8 +239,7 @@ int gatehwspinlock_destroy(void)
 			lock_handle = gatehwspinlock_module->hw_lock_handles[i];
 			retval = hwspinlock_free(lock_handle);
 			if (retval < 0)
-				printk(KERN_ERR "hwspinlock_free failed for"
-					"id = %d", i);
+				pr_err("hwspinlock_free failed for id = %d", i);
 			gatehwspinlock_module->hw_lock_handles[i] = NULL;
 	}
 	memset(&gatehwspinlock_module->cfg, 0,
@@ -251,12 +249,9 @@ int gatehwspinlock_destroy(void)
 	return 0;
 
 exit:
-	if (retval < 0) {
-		printk(KERN_ERR "gatehwspinlock_destroy failed status:%x\n",
-			retval);
-	}
+	if (retval < 0)
+		pr_err("gatehwspinlock_destroy failed status:%x\n", retval);
 	return retval;
-
 }
 EXPORT_SYMBOL(gatehwspinlock_destroy);
 
@@ -375,7 +370,7 @@ void *gatehwspinlock_create(enum igatempsupport_local_protect local_protect,
 		gatehwspinlock_module->hw_lock_handles[params->resource_id];
 	if (obj->hwhandle == NULL) {
 		retval = -EBUSY;
-		printk(KERN_ERR "hwspinlock_request failed for id = %d",
+		pr_err("hwspinlock_request failed for id = %d",
 			params->resource_id);
 		goto free_obj;
 	}
@@ -385,7 +380,7 @@ void *gatehwspinlock_create(enum igatempsupport_local_protect local_protect,
 free_obj:
 	kfree(obj);
 exit:
-	printk(KERN_ERR "gatehwspinlock_create failed status: %x\n", retval);
+	pr_err("gatehwspinlock_create failed status: %x\n", retval);
 	return NULL;
 }
 EXPORT_SYMBOL(gatehwspinlock_create);
@@ -427,7 +422,7 @@ int gatehwspinlock_delete(void **gphandle)
 	return 0;
 
 exit:
-	printk(KERN_ERR "gatehwspinlock_delete failed status: %x\n", retval);
+	pr_err("gatehwspinlock_delete failed status: %x\n", retval);
 	return retval;
 }
 EXPORT_SYMBOL(gatehwspinlock_delete);
@@ -480,8 +475,7 @@ int *gatehwspinlock_enter(void *gphandle)
 
 exit:
 	if (retval < 0)
-		printk(KERN_ERR "gatehwspinlock_enter failed! status = 0x%x",
-			retval);
+		pr_err("gatehwspinlock_enter failed! status = 0x%x", retval);
 	return key;
 }
 EXPORT_SYMBOL(gatehwspinlock_enter);
@@ -522,8 +516,7 @@ void gatehwspinlock_leave(void *gphandle, int *key)
 
 exit:
 	if (retval < 0)
-		printk(KERN_ERR "gatehwspinlock_leave failed! status = 0x%x",
-			retval);
+		pr_err("gatehwspinlock_leave failed! status = 0x%x", retval);
 	return;
 }
 EXPORT_SYMBOL(gatehwspinlock_leave);
@@ -552,8 +545,7 @@ static u32 gatehwspinlock_get_resource_id(void *handle)
 	return obj->lock_num;
 
 exit:
-	printk(KERN_ERR "gatehwspinlock_get_resource_id failed status: %x\n",
-		retval);
+	pr_err("gatehwspinlock_get_resource_id failed status: %x\n", retval);
 	return (u32)-1;
 }
 EXPORT_SYMBOL(gatehwspinlock_get_resource_id);
diff --git a/drivers/dsp/syslink/multicore_ipc/gatemp.c b/drivers/dsp/syslink/multicore_ipc/gatemp.c
index 12dd4552ae7..a9e47eff911 100644
--- a/drivers/dsp/syslink/multicore_ipc/gatemp.c
+++ b/drivers/dsp/syslink/multicore_ipc/gatemp.c
@@ -238,8 +238,7 @@ void gatemp_get_config(struct gatemp_config *cfg)
 
 exit:
 	if (retval < 0)
-		printk(KERN_ERR "gatemp_get_config failed! status = 0x%x",
-			retval);
+		pr_err("gatemp_get_config failed! status = 0x%x", retval);
 	return;
 }
 
@@ -418,7 +417,7 @@ error_nameserver:
 	kfree(gatemp_module->gate_mutex);
 	gatemp_module->gate_mutex = NULL;
 exit:
-	printk(KERN_ERR "gatemp_setup failed! status = 0x%x", retval);
+	pr_err("gatemp_setup failed! status = 0x%x", retval);
 	return retval;
 }
 
@@ -476,7 +475,7 @@ s32 gatemp_destroy(void)
 
 exit:
 	if (retval < 0)
-		printk(KERN_ERR "gatemp_destroy failed! status = 0x%x", retval);
+		pr_err("gatemp_destroy failed! status = 0x%x", retval);
 	return retval;
 }
 
@@ -851,8 +850,7 @@ proxy_work:
 	}
 
 	if (retval != 0) {
-		printk(KERN_ERR "gatemp_instance_init failed! status = 0x%x",
-			retval);
+		pr_err("gatemp_instance_init failed! status = 0x%x", retval);
 	}
 	return retval;
 }
@@ -971,7 +969,7 @@ static void gatemp_instance_finalize(struct gatemp_object *obj, int status)
 
 exit:
 	if (retval < 0) {
-		printk(KERN_ERR "gatemp_instance_finalize failed! "
+		pr_err("gatemp_instance_finalize failed! "
 			"status = 0x%x", retval);
 	}
 	return;
@@ -1049,7 +1047,7 @@ int gatemp_open(char *name, void **handle)
 
 exit:
 	if (retval < 0)
-		printk(KERN_ERR "gatemp_open failed! status = 0x%x", retval);
+		pr_err("gatemp_open failed! status = 0x%x", retval);
 	return retval;
 }
 
@@ -1155,10 +1153,8 @@ int gatemp_open_by_addr(void *shared_addr, void **handle)
 	}
 
 exit:
-	if (retval < 0) {
-		printk(KERN_ERR "gatemp_open_by_addr failed! status = 0x%x",
-			retval);
-	}
+	if (retval < 0)
+		pr_err("gatemp_open_by_addr failed! status = 0x%x", retval);
 	return retval;
 }
 
@@ -1206,7 +1202,7 @@ int gatemp_close(void **handle)
 	return 0;
 
 exit:
-	printk(KERN_ERR "gatemp_close failed! status = 0x%x", retval);
+	pr_err("gatemp_close failed! status = 0x%x", retval);
 	return retval;
 }
 
@@ -1449,7 +1445,7 @@ static void gatemp_set_region0_reserved(void *shared_addr)
 
 static void gatemp_clear_region0_reserved(void)
 {
-	printk(KERN_INFO "gatemp_clear_region0_reserved: either nothing to do "
+	pr_info("gatemp_clear_region0_reserved: either nothing to do "
 		"or not implemented");
 }
 
@@ -1516,7 +1512,7 @@ static void gatemp_open_region0_reserved(void *shared_addr)
 
 static void gatemp_close_region0_reserved(void *shared_addr)
 {
-	printk(KERN_INFO "gatemp_close_region0_reserved: either nothing to do "
+	pr_info("gatemp_close_region0_reserved: either nothing to do "
 		"or not implemented");
 }
 
@@ -1577,7 +1573,7 @@ int gatemp_start(void *shared_addr)
 	}
 
 	if (retval < 0)
-		printk(KERN_ERR "gatemp_start failed! status = 0x%x", retval);
+		pr_err("gatemp_start failed! status = 0x%x", retval);
 	return retval;
 }
 
@@ -1683,7 +1679,7 @@ void *gatemp_create(const struct gatemp_params *params)
 
 exit:
 	if (retval < 0)
-		printk(KERN_ERR "gatemp_create failed! status = 0x%x", retval);
+		pr_err("gatemp_create failed! status = 0x%x", retval);
 	return (void *)handle;
 }
 
@@ -1722,7 +1718,7 @@ gatemp_init_fail:
 	kfree(obj);
 	obj = NULL;
 exit:
-	printk(KERN_ERR "_gatemp_create failed! status = 0x%x", retval);
+	pr_err("_gatemp_create failed! status = 0x%x", retval);
 	return (void *)NULL;
 }
 
@@ -1776,7 +1772,7 @@ int gatemp_delete(void **handle)
 	return 0;
 
 exit:
-	printk(KERN_ERR "gatemp_delete failed! status = 0x%x", retval);
+	pr_err("gatemp_delete failed! status = 0x%x", retval);
 	return retval;
 }
 
@@ -1823,7 +1819,7 @@ int gatemp_attach(u16 remote_proc_id, void *shared_addr)
 
 exit:
 	if (retval < 0)
-		printk(KERN_ERR "gatemp_attach failed! status = 0x%x", retval);
+		pr_err("gatemp_attach failed! status = 0x%x", retval);
 	return retval;
 }
 
@@ -1857,6 +1853,6 @@ int gatemp_detach(u16 remote_proc_id, void *shared_addr)
 
 exit:
 	if (retval < 0)
-		printk(KERN_ERR "gatemp_detach failed! status = 0x%x", retval);
+		pr_err("gatemp_detach failed! status = 0x%x", retval);
 	return retval;
 }
diff --git a/drivers/dsp/syslink/multicore_ipc/gatepeterson.c b/drivers/dsp/syslink/multicore_ipc/gatepeterson.c
index 19fa4ea3882..21a58c20a1b 100644
--- a/drivers/dsp/syslink/multicore_ipc/gatepeterson.c
+++ b/drivers/dsp/syslink/multicore_ipc/gatepeterson.c
@@ -209,8 +209,7 @@ exit:
 	atomic_set(&gatepeterson_module->ref_count,
 				GATEPETERSON_MAKE_MAGICSTAMP(0));
 
-	printk(KERN_ERR	"gatepeterson_setup failed status: %x\n",
-			retval);
+	pr_err("gatepeterson_setup failed status: %x\n", retval);
 	return retval;
 }
 EXPORT_SYMBOL(gatepeterson_setup);
@@ -272,12 +271,9 @@ int gatepeterson_destroy(void)
 	return 0;
 
 exit:
-	if (retval < 0) {
-		printk(KERN_ERR "gatepeterson_destroy failed status:%x\n",
-			retval);
-	}
+	if (retval < 0)
+		pr_err("gatepeterson_destroy failed status:%x\n", retval);
 	return retval;
-
 }
 EXPORT_SYMBOL(gatepeterson_destroy);
 
@@ -418,10 +414,8 @@ static int gatepeterson_instance_init(struct gatepeterson_object *obj,
 	}
 
 exit:
-	if (retval < 0) {
-		printk(KERN_ERR "gatemp_instance_init failed! status = 0x%x",
-			retval);
-	}
+	if (retval < 0)
+		pr_err("gatemp_instance_init failed! status = 0x%x", retval);
 	return retval;
 }
 
@@ -545,8 +539,7 @@ int gatepeterson_delete(void **gphandle)
 	return 0;
 
 exit:
-	printk(KERN_ERR "gatepeterson_delete failed status: %x\n",
-			retval);
+	pr_err("gatepeterson_delete failed status: %x\n", retval);
 	return retval;
 }
 EXPORT_SYMBOL(gatepeterson_delete);
@@ -604,7 +597,7 @@ int gatepeterson_open_by_addr(enum igatempsupport_local_protect local_protect,
 	return 0;
 
 exit:
-	printk(KERN_ERR "gatepeterson_open failed status: %x\n", retval);
+	pr_err("gatepeterson_open failed status: %x\n", retval);
 	return retval;
 }
 EXPORT_SYMBOL(gatepeterson_open_by_addr);
@@ -668,7 +661,7 @@ error_handle:
 	gatemp_leave(obj->local_gate, key);
 
 exit:
-	printk(KERN_ERR "gatepeterson_close failed status: %x\n", retval);
+	pr_err("gatepeterson_close failed status: %x\n", retval);
 	return retval;
 }
 EXPORT_SYMBOL(gatepeterson_close);
@@ -939,10 +932,10 @@ obj_alloc_fail:
 
 exit:
 	if (create_flag == true)
-		printk(KERN_ERR "_gatepeterson_create (create) failed "
+		pr_err("_gatepeterson_create (create) failed "
 			"status: %x\n", status);
 	else
-		printk(KERN_ERR "_gatepeterson_create (open) failed "
+		pr_err("_gatepeterson_create (open) failed "
 			"status: %x\n", status);
 
 	return NULL;
diff --git a/drivers/dsp/syslink/multicore_ipc/heapbufmp.c b/drivers/dsp/syslink/multicore_ipc/heapbufmp.c
index 2ca58345fc0..7840c79fe1d 100644
--- a/drivers/dsp/syslink/multicore_ipc/heapbufmp.c
+++ b/drivers/dsp/syslink/multicore_ipc/heapbufmp.c
@@ -161,7 +161,7 @@ int heapbufmp_get_config(struct heapbufmp_config *cfgparams)
 					sizeof(struct heapbufmp_config));
 	return 0;
 error:
-	printk(KERN_ERR "heapbufmp_get_config failed status: %x\n", retval);
+	pr_err("heapbufmp_get_config failed status: %x\n", retval);
 	return retval;
 }
 EXPORT_SYMBOL(heapbufmp_get_config);
@@ -242,7 +242,7 @@ int heapbufmp_setup(const struct heapbufmp_config *cfg)
 	return 0;
 
 error:
-	printk(KERN_ERR "heapbufmp_setup failed status: %x\n", retval);
+	pr_err("heapbufmp_setup failed status: %x\n", retval);
 	return retval;
 }
 EXPORT_SYMBOL(heapbufmp_setup);
@@ -315,7 +315,7 @@ int heapbufmp_destroy(void)
 	return 0;
 
 error:
-	printk(KERN_ERR "heapbufmp_destroy failed status: %x\n", retval);
+	pr_err("heapbufmp_destroy failed status: %x\n", retval);
 	return retval;
 }
 EXPORT_SYMBOL(heapbufmp_destroy);
@@ -344,7 +344,7 @@ void heapbufmp_params_init(struct heapbufmp_params *params)
 
 	return;
 error:
-	printk(KERN_ERR "heapbufmp_params_init failed status: %x\n", retval);
+	pr_err("heapbufmp_params_init failed status: %x\n", retval);
 }
 EXPORT_SYMBOL(heapbufmp_params_init);
 
@@ -573,7 +573,7 @@ error:
 	else
 		heapbufmp_close(handle_ptr);
 
-	printk(KERN_ERR "_heapbufmp_create failed status: %x\n", retval);
+	pr_err("_heapbufmp_create failed status: %x\n", retval);
 	return retval;
 }
 
@@ -620,7 +620,7 @@ void *heapbufmp_create(const struct heapbufmp_params *params)
 	return (void *)handle;
 
 error:
-	printk(KERN_ERR "heapbufmp_create failed status: %x\n", retval);
+	pr_err("heapbufmp_create failed status: %x\n", retval);
 	return (void *)handle;
 }
 EXPORT_SYMBOL(heapbufmp_create);
@@ -740,7 +740,7 @@ device_busy_error:
 	gatemp_leave(obj->gate, key);
 
 error:
-	printk(KERN_ERR "heapbufmp_delete failed status: %x\n", retval);
+	pr_err("heapbufmp_delete failed status: %x\n", retval);
 	return retval;
 }
 EXPORT_SYMBOL(heapbufmp_delete);
@@ -831,7 +831,7 @@ int heapbufmp_open(char *name, void **handle_ptr)
 	return 0;
 
 error:
-	printk(KERN_ERR "heapbufmp_open failed status: %x\n", retval);
+	pr_err("heapbufmp_open failed status: %x\n", retval);
 	return retval;
 }
 EXPORT_SYMBOL(heapbufmp_open);
@@ -908,7 +908,7 @@ int heapbufmp_close(void **handle_ptr)
 	return 0;
 
 error:
-	printk(KERN_ERR "heapbufmp_close failed status: %x\n", retval);
+	pr_err("heapbufmp_close failed status: %x\n", retval);
 	return retval;
 }
 EXPORT_SYMBOL(heapbufmp_close);
@@ -1001,11 +1001,11 @@ void *heapbufmp_alloc(void *hphandle, u32 size, u32 align)
 	gatemp_leave(obj->gate, key);
 
 	if (block == NULL)
-		printk(KERN_ERR "heapbufmp_alloc returned NULL\n");
+		pr_err("heapbufmp_alloc returned NULL\n");
 
 	return block;
 error:
-	printk(KERN_ERR "heapbufmp_alloc failed status: %x\n", retval);
+	pr_err("heapbufmp_alloc failed status: %x\n", retval);
 	return NULL;
 }
 EXPORT_SYMBOL(heapbufmp_alloc);
@@ -1079,7 +1079,7 @@ int heapbufmp_free(void *hphandle, void *block, u32 size)
 	return 0;
 
 error:
-	printk(KERN_ERR "heapbufmp_free failed status: %x\n", retval);
+	pr_err("heapbufmp_free failed status: %x\n", retval);
 	return retval;
 }
 EXPORT_SYMBOL(heapbufmp_free);
@@ -1149,8 +1149,7 @@ void heapbufmp_get_stats(void *hphandle, struct memory_stats *stats)
 
 error:
 	if (retval < 0)
-		printk(KERN_ERR "heapbufmp_get_stats status: [0x%x]\n",
-								retval);
+		pr_err("heapbufmp_get_stats status: [0x%x]\n", retval);
 }
 EXPORT_SYMBOL(heapbufmp_get_stats);
 
@@ -1177,7 +1176,7 @@ bool heapbufmp_isblocking(void *handle)
 	return isblocking;
 
 error:
-	printk(KERN_ERR "heapbufmp_isblocking status: %x\n", retval);
+	pr_err("heapbufmp_isblocking status: %x\n", retval);
 	return isblocking;
 }
 EXPORT_SYMBOL(heapbufmp_isblocking);
@@ -1255,8 +1254,7 @@ void heapbufmp_get_extended_stats(void *hphandle,
 	return;
 
 error:
-	printk(KERN_ERR "heapbufmp_get_extended_stats status: %x\n",
-			retval);
+	pr_err("heapbufmp_get_extended_stats status: %x\n", retval);
 }
 EXPORT_SYMBOL(heapbufmp_get_extended_stats);
 
@@ -1335,8 +1333,7 @@ int heapbufmp_shared_mem_req(const struct heapbufmp_params *params)
 
 	return mem_req;
 error:
-	printk(KERN_ERR "heapbufmp_shared_mem_req status: %x\n",
-		status);
+	pr_err("heapbufmp_shared_mem_req status: %x\n", status);
 	return mem_req;
 }
 EXPORT_SYMBOL(heapbufmp_shared_mem_req);
@@ -1415,8 +1412,7 @@ heapbufmp_open_by_addr(void *shared_addr, void **handle_ptr)
 	return 0;
 
 error:
-	printk(KERN_ERR "heapbufmp_open_by_addr status: %x\n",
-		retval);
+	pr_err("heapbufmp_open_by_addr status: %x\n", retval);
 
 	return retval;
 }
@@ -1554,6 +1550,6 @@ created_free_list_error:
 	listmp_delete(&obj->free_list);
 
 error:
-	printk(KERN_ERR "heapmem_post_init status: %x\n", retval);
+	pr_err("heapmem_post_init status: %x\n", retval);
 	return retval;
 }
diff --git a/drivers/dsp/syslink/multicore_ipc/heapmemmp.c b/drivers/dsp/syslink/multicore_ipc/heapmemmp.c
index 269340094db..2deae6c7c41 100644
--- a/drivers/dsp/syslink/multicore_ipc/heapmemmp.c
+++ b/drivers/dsp/syslink/multicore_ipc/heapmemmp.c
@@ -155,7 +155,7 @@ int heapmemmp_get_config(struct heapmemmp_config *cfgparams)
 					sizeof(struct heapmemmp_config));
 	return 0;
 error:
-	printk(KERN_ERR "heapmemmp_get_config failed status: %x\n", retval);
+	pr_err("heapmemmp_get_config failed status: %x\n", retval);
 	return retval;
 }
 EXPORT_SYMBOL(heapmemmp_get_config);
@@ -233,7 +233,7 @@ int heapmemmp_setup(const struct heapmemmp_config *cfg)
 	return 0;
 
 error:
-	printk(KERN_ERR "heapmemmp_setup failed status: %x\n", retval);
+	pr_err("heapmemmp_setup failed status: %x\n", retval);
 	return retval;
 }
 EXPORT_SYMBOL(heapmemmp_setup);
@@ -304,7 +304,7 @@ int heapmemmp_destroy(void)
 	return 0;
 
 error:
-	printk(KERN_ERR "heapmemmp_destroy failed status: %x\n", retval);
+	pr_err("heapmemmp_destroy failed status: %x\n", retval);
 	return retval;
 }
 EXPORT_SYMBOL(heapmemmp_destroy);
@@ -331,7 +331,7 @@ void heapmemmp_params_init(struct heapmemmp_params *params)
 
 	return;
 error:
-	printk(KERN_ERR "heapmemmp_params_init failed status: %x\n", retval);
+	pr_err("heapmemmp_params_init failed status: %x\n", retval);
 }
 EXPORT_SYMBOL(heapmemmp_params_init);
 
@@ -543,7 +543,7 @@ error:
 		heapmemmp_delete(handle_ptr);
 	else
 		heapmemmp_close(handle_ptr);
-	printk(KERN_ERR "_heapmemmp_create failed status: %x\n", retval);
+	pr_err("_heapmemmp_create failed status: %x\n", retval);
 	return retval;
 }
 
@@ -583,7 +583,7 @@ void *heapmemmp_create(const struct heapmemmp_params *params)
 	return (void *)handle;
 
 error:
-	printk(KERN_ERR "heapmemmp_create failed status: %x\n", retval);
+	pr_err("heapmemmp_create failed status: %x\n", retval);
 	return (void *)handle;
 }
 EXPORT_SYMBOL(heapmemmp_create);
@@ -696,7 +696,7 @@ device_busy_error:
 	gatemp_leave(obj->gate, key);
 
 error:
-	printk(KERN_ERR "heapmemmp_delete failed status: %x\n", retval);
+	pr_err("heapmemmp_delete failed status: %x\n", retval);
 	return retval;
 }
 EXPORT_SYMBOL(heapmemmp_delete);
@@ -785,7 +785,7 @@ int heapmemmp_open(char *name, void **handle_ptr)
 	return 0;
 
 error:
-	printk(KERN_ERR "heapmemmp_open failed status: %x\n", retval);
+	pr_err("heapmemmp_open failed status: %x\n", retval);
 	return retval;
 }
 EXPORT_SYMBOL(heapmemmp_open);
@@ -857,7 +857,7 @@ int heapmemmp_close(void **handle_ptr)
 	return 0;
 
 error:
-	printk(KERN_ERR "heapmemmp_close failed status: %x\n", retval);
+	pr_err("heapmemmp_close failed status: %x\n", retval);
 	return retval;
 }
 EXPORT_SYMBOL(heapmemmp_close);
@@ -1102,11 +1102,11 @@ void *heapmemmp_alloc(void *hphandle, u32 size, u32 align)
 	gatemp_leave(obj->gate, key);
 
 	if (alloc_addr == NULL)
-		printk(KERN_ERR "heapmemmp_alloc returned NULL\n");
+		pr_err("heapmemmp_alloc returned NULL\n");
 	return alloc_addr;
 
 error:
-	printk(KERN_ERR "heapmemmp_alloc failed status: %x\n", retval);
+	pr_err("heapmemmp_alloc failed status: %x\n", retval);
 	return NULL;
 }
 EXPORT_SYMBOL(heapmemmp_alloc);
@@ -1269,7 +1269,7 @@ int heapmemmp_free(void *hphandle, void *addr, u32 size)
 	return 0;
 
 error:
-	printk(KERN_ERR "heapmemmp_free failed status: %x\n", retval);
+	pr_err("heapmemmp_free failed status: %x\n", retval);
 	return retval;
 }
 EXPORT_SYMBOL(heapmemmp_free);
@@ -1342,7 +1342,7 @@ void heapmemmp_get_stats(void *hphandle, struct memory_stats *stats)
 	gatemp_leave(obj->gate, key);
 error:
 	if (status < 0)
-		printk(KERN_ERR "heapmemmp_get_stats status: %x\n", status);
+		pr_err("heapmemmp_get_stats status: %x\n", status);
 }
 EXPORT_SYMBOL(heapmemmp_get_stats);
 
@@ -1367,7 +1367,7 @@ bool heapmemmp_isblocking(void *handle)
 	return isblocking;
 
 error:
-	printk(KERN_ERR "heapmemmp_isblocking status: %x\n", retval);
+	pr_err("heapmemmp_isblocking status: %x\n", retval);
 	return isblocking;
 }
 EXPORT_SYMBOL(heapmemmp_isblocking);
@@ -1414,8 +1414,7 @@ void heapmemmp_get_extended_stats(void *hphandle,
 	return;
 
 error:
-	printk(KERN_ERR "heapmemmp_get_extended_stats status: %x\n",
-			status);
+	pr_err("heapmemmp_get_extended_stats status: %x\n", status);
 }
 EXPORT_SYMBOL(heapmemmp_get_extended_stats);
 
@@ -1461,8 +1460,7 @@ int heapmemmp_shared_mem_req(const struct heapmemmp_params *params)
 	return mem_req;
 
 error:
-	printk(KERN_ERR "heapmemmp_shared_mem_req retval: %x\n",
-		retval);
+	pr_err("heapmemmp_shared_mem_req retval: %x\n", retval);
 	return mem_req;
 }
 EXPORT_SYMBOL(heapmemmp_shared_mem_req);
@@ -1544,8 +1542,7 @@ heapmemmp_open_by_addr(void *shared_addr, void **handle_ptr)
 	return 0;
 
 error:
-	printk(KERN_ERR "heapmemmp_open_by_addr status: %x\n",
-		retval);
+	pr_err("heapmemmp_open_by_addr status: %x\n", retval);
 	return retval;
 }
 
@@ -1625,8 +1622,7 @@ static int heapmemmp_post_init(struct heapmemmp_object *handle)
 
 	return 0;
 error:
-	printk(KERN_ERR "heapmemmp_post_init status: %x\n",
-		retval);
+	pr_err("heapmemmp_post_init status: %x\n", retval);
 	return retval;
 }
 
diff --git a/drivers/dsp/syslink/multicore_ipc/ipc.c b/drivers/dsp/syslink/multicore_ipc/ipc.c
index 573b864186e..323006f0a72 100644
--- a/drivers/dsp/syslink/multicore_ipc/ipc.c
+++ b/drivers/dsp/syslink/multicore_ipc/ipc.c
@@ -223,7 +223,7 @@ int ipc_attach(u16 remote_proc_id)
 	struct ipc_proc_entry *ipc;
 
 	if (remote_proc_id >= MULTIPROC_MAXPROCESSORS) {
-		printk(KERN_ERR "Invalid remote_proc_id passed\n");
+		pr_err("Invalid remote_proc_id passed\n");
 		return IPC_E_FAIL;
 	}
 
@@ -247,11 +247,10 @@ int ipc_attach(u16 remote_proc_id)
 							ipc_shared_addr);
 
 	if (status < 0)
-		printk(KERN_ERR "ipc_attach : ipc_proc_sync_start "
+		pr_err("ipc_attach : ipc_proc_sync_start "
 			"failed [0x%x]\n", status);
 	else
-		printk(KERN_ERR "ipc_proc_sync_start : status [0x%x]\n",
-			status);
+		pr_err("ipc_proc_sync_start : status [0x%x]\n", status);
 
 
 	if (status >= 0) {
@@ -259,11 +258,10 @@ int ipc_attach(u16 remote_proc_id)
 		status = gatemp_attach(remote_proc_id, ipc_module->
 							gatemp_shared_addr);
 		if (status < 0)
-			printk(KERN_ERR "ipc_attach : gatemp_attach "
+			pr_err("ipc_attach : gatemp_attach "
 				"failed [0x%x]\n", status);
 		else
-			printk(KERN_ERR "gatemp_attach : status [0x%x]\n",
-				status);
+			pr_err("gatemp_attach : status [0x%x]\n", status);
 
 	}
 
@@ -271,10 +269,10 @@ int ipc_attach(u16 remote_proc_id)
 	if (status >= 0) {
 		status = sharedregion_attach(remote_proc_id);
 		if (status < 0)
-			printk(KERN_ERR "ipc_attach : sharedregion_attach "
+			pr_err("ipc_attach : sharedregion_attach "
 				"failed [0x%x]\n", status);
 		else
-			printk(KERN_ERR "sharedregion_attach : status "
+			pr_err("sharedregion_attach : status "
 				"[0x%x]\n", status);
 	}
 
@@ -296,11 +294,11 @@ int ipc_attach(u16 remote_proc_id)
 			if (slave->notify_sr_ptr ==
 						SHAREDREGION_INVALIDSRPTR) {
 				status = IPC_E_FAIL;
-				printk(KERN_ERR "ipc_attach : "
+				pr_err("ipc_attach : "
 					"sharedregion_get_srptr "
 					"failed [0x%x]\n", status);
 			} else {
-				printk(KERN_ERR
+				pr_err(
 					"sharedregion_get_srptr : "
 					"status [0x%x]\n", status);
 			}
@@ -309,11 +307,11 @@ int ipc_attach(u16 remote_proc_id)
 							notify_sr_ptr);
 			if (notify_shared_addr == NULL) {
 				status = IPC_E_FAIL;
-				printk(KERN_ERR "ipc_attach : "
+				pr_err("ipc_attach : "
 					"sharedregion_get_ptr "
 					"failed [0x%x]\n", status);
 			} else {
-				printk(KERN_ERR
+				pr_err(
 					"sharedregion_get_ptr : "
 					"status [0x%x]\n", status);
 			}
@@ -323,11 +321,11 @@ int ipc_attach(u16 remote_proc_id)
 			status = notify_attach(remote_proc_id,
 							notify_shared_addr);
 			if (status < 0)
-				printk(KERN_ERR "ipc_attach : "
+				pr_err("ipc_attach : "
 					"notify_attach "
 					"failed [0x%x]\n", status);
 			else
-					printk(KERN_ERR
+					pr_err(
 						"notify_attach : "
 						"status [0x%x]\n", status);
 		}
@@ -339,11 +337,11 @@ int ipc_attach(u16 remote_proc_id)
 			status = ipu_pm_attach(remote_proc_id, ipc_module->
 							ipu_pm_shared_addr);
 			if (status < 0)
-				printk(KERN_ERR "ipc_attach : "
+				pr_err("ipc_attach : "
 					"ipu_pm_attach "
 					"failed [0x%x]\n", status);
 			else
-				printk(KERN_ERR
+				pr_err(
 					"ipu_pm_attach : "
 					"status [0x%x]\n", status);
 		}
@@ -362,11 +360,11 @@ int ipc_attach(u16 remote_proc_id)
 				sharedregion_get_srptr(nsrn_shared_addr, 0);
 			if (slave->nsrn_sr_ptr == SHAREDREGION_INVALIDSRPTR) {
 				status = IPC_E_FAIL;
-				printk(KERN_ERR "ipc_attach : "
+				pr_err("ipc_attach : "
 					"sharedregion_get_srptr "
 					"failed [0x%x]\n", status);
 			} else {
-				printk(KERN_ERR
+				pr_err(
 					"sharedregion_get_srptr : "
 					"status [0x%x]\n", status);
 			}
@@ -375,11 +373,11 @@ int ipc_attach(u16 remote_proc_id)
 				sharedregion_get_ptr(slave->nsrn_sr_ptr);
 			if (nsrn_shared_addr == NULL) {
 				status = IPC_E_FAIL;
-				printk(KERN_ERR "ipc_attach : "
+				pr_err("ipc_attach : "
 					"sharedregion_get_ptr "
 					"failed [0x%x]\n", status);
 			} else {
-				printk(KERN_ERR
+				pr_err(
 					"sharedregion_get_ptr : "
 					"status [0x%x]\n", status);
 			}
@@ -391,11 +389,11 @@ int ipc_attach(u16 remote_proc_id)
 							nsrn_shared_addr);
 
 			if (status < 0)
-				printk(KERN_ERR "ipc_attach : "
+				pr_err("ipc_attach : "
 					"nameserver_remotenotify_attach "
 					"failed [0x%x]\n", status);
 			else
-				printk(KERN_ERR
+				pr_err(
 					"nameserver_remotenotify_attach : "
 					"status [0x%x]\n", status);
 		}
@@ -415,11 +413,11 @@ int ipc_attach(u16 remote_proc_id)
 			if (slave->transport_sr_ptr ==
 					SHAREDREGION_INVALIDSRPTR) {
 				status = IPC_E_FAIL;
-				printk(KERN_ERR "ipc_attach : "
+				pr_err("ipc_attach : "
 					"sharedregion_get_srptr "
 					"failed [0x%x]\n", status);
 			} else {
-				printk(KERN_ERR
+				pr_err(
 					"sharedregion_get_srptr : "
 					"status [0x%x]\n", status);
 			}
@@ -428,11 +426,11 @@ int ipc_attach(u16 remote_proc_id)
 							transport_sr_ptr);
 			if (msgq_shared_addr == NULL) {
 				status = IPC_E_FAIL;
-				printk(KERN_ERR "ipc_attach : "
+				pr_err("ipc_attach : "
 					"sharedregion_get_ptr "
 					"failed [0x%x]\n", status);
 			} else {
-				printk(KERN_ERR
+				pr_err(
 					"sharedregion_get_ptr : "
 					"status [0x%x]\n", status);
 			}
@@ -443,11 +441,11 @@ int ipc_attach(u16 remote_proc_id)
 			status = messageq_attach(remote_proc_id,
 							msgq_shared_addr);
 			if (status < 0)
-				printk(KERN_ERR "ipc_attach : "
+				pr_err("ipc_attach : "
 					"messageq_attach "
 					"failed [0x%x]\n", status);
 			else
-				printk(KERN_ERR
+				pr_err(
 					"messageq_attach : "
 					"status [0x%x]\n", status);
 		}
@@ -465,11 +463,11 @@ int ipc_attach(u16 remote_proc_id)
 		status = ipc_proc_sync_finish(remote_proc_id,
 						ipc_module->ipc_shared_addr);
 		if (status < 0)
-			printk(KERN_ERR "ipc_attach : "
+			pr_err("ipc_attach : "
 				"ipc_proc_sync_finish "
 				"failed [0x%x]\n", status);
 		else
-			printk(KERN_ERR
+			pr_err(
 				"ipc_proc_sync_finish : "
 				"status [0x%x]\n", status);
 	}
@@ -477,7 +475,7 @@ int ipc_attach(u16 remote_proc_id)
 	if (status >= 0)
 		ipc->is_attached = true;
 	else
-		printk(KERN_ERR "ipc_attach failed! status = 0x%x\n", status);
+		pr_err("ipc_attach failed! status = 0x%x\n", status);
 
 	return status;
 }
@@ -526,11 +524,11 @@ int ipc_detach(u16 remote_proc_id)
 			/* call messageq_detach for remote processor */
 			status = messageq_detach(remote_proc_id);
 			if (status < 0)
-				printk(KERN_ERR "ipc_detach : "
+				pr_err("ipc_detach : "
 					"messageq_detach "
 					"failed [0x%x]\n", status);
 			else
-				printk(KERN_ERR
+				pr_err(
 					"messageq_detach : "
 					"status [0x%x]\n", status);
 
@@ -563,11 +561,11 @@ int ipc_detach(u16 remote_proc_id)
 			status = nameserver_remotenotify_detach(
 							remote_proc_id);
 			if (status < 0)
-				printk(KERN_ERR "ipc_detach : "
+				pr_err("ipc_detach : "
 					"nameserver_remotenotify_detach "
 					"failed [0x%x]\n", status);
 			else
-				printk(KERN_ERR
+				pr_err(
 					"nameserver_remotenotify_detach : "
 					"status [0x%x]\n", status);
 
@@ -595,11 +593,11 @@ int ipc_detach(u16 remote_proc_id)
 			/* call ipu_pm_detach for remote processor */
 			status = ipu_pm_detach(remote_proc_id);
 			if (status < 0)
-				printk(KERN_ERR "ipc_detach : "
+				pr_err("ipc_detach : "
 					"ipu_pm_detach "
 					"failed [0x%x]\n", status);
 			else
-				printk(KERN_ERR
+				pr_err(
 					"ipu_pm_detach : "
 					"status [0x%x]\n", status);
 		}
@@ -608,11 +606,11 @@ int ipc_detach(u16 remote_proc_id)
 			/* call notify_detach for remote processor */
 			status = notify_detach(remote_proc_id);
 			if (status < 0)
-				printk(KERN_ERR "ipc_detach : "
+				pr_err("ipc_detach : "
 					"notify_detach "
 					"failed [0x%x]\n", status);
 			else
-				printk(KERN_ERR
+				pr_err(
 					"notify_detach : "
 					"status [0x%x]\n", status);
 
@@ -680,8 +678,7 @@ int ipc_detach(u16 remote_proc_id)
 
 exit:
 	if (status < 0)
-		printk(KERN_ERR "ipc_detach failed with status [0x%x]\n",
-								status);
+		pr_err("ipc_detach failed with status [0x%x]\n", status);
 	return status;
 }
 
@@ -701,7 +698,7 @@ ipc_control(u16 proc_id, u32 cmd_id, void *arg)
 #if defined CONFIG_SYSLINK_USE_SYSMGR
 		status = platform_load_callback(proc_id, arg);
 		if (status < 0)
-			printk(KERN_ERR "ipc_control : platform_load_callback "
+			pr_err("ipc_control : platform_load_callback "
 				"failed [0x%x]\n", status);
 #endif
 	}
@@ -712,7 +709,7 @@ ipc_control(u16 proc_id, u32 cmd_id, void *arg)
 #if defined CONFIG_SYSLINK_USE_SYSMGR
 		status = platform_start_callback(proc_id, arg);
 		if (status < 0)
-			printk(KERN_ERR "ipc_control : platform_start_callback"
+			pr_err("ipc_control : platform_start_callback"
 				" failed [0x%x]\n", status);
 #endif
 	}
@@ -723,7 +720,7 @@ ipc_control(u16 proc_id, u32 cmd_id, void *arg)
 #if defined CONFIG_SYSLINK_USE_SYSMGR
 		status = platform_stop_callback(proc_id, arg);
 		if (status < 0)
-			printk(KERN_ERR "ipc_control : platform_stop_callback"
+			pr_err("ipc_control : platform_stop_callback"
 				" failed [0x%x]\n", status);
 #endif
 	}
@@ -732,7 +729,7 @@ ipc_control(u16 proc_id, u32 cmd_id, void *arg)
 	default:
 	{
 		status = -EINVAL;
-		printk(KERN_ERR "ipc_control : invalid "
+		pr_err("ipc_control : invalid "
 				" command code [0x%x]\n", cmd_id);
 	}
 	break;
@@ -911,10 +908,9 @@ static int ipc_proc_sync_start(u16 remote_proc_id, void *shared_addr)
 	}
 exit:
 	if (status < 0)
-		printk(KERN_ERR "ipc_proc_sync_start failed: status [0x%x]\n",
-								status);
+		pr_err("ipc_proc_sync_start failed: status [0x%x]\n", status);
 	else
-		printk(KERN_ERR "ipc_proc_sync_start done\n");
+		pr_err("ipc_proc_sync_start done\n");
 
 	return status;
 }
@@ -1043,8 +1039,7 @@ int ipc_read_config(u16 remote_proc_id, u32 tag, void *cfg, u32 size)
 
 exit:
 	if (status < 0)
-		printk(KERN_ERR "ipc_read_config failed: status [0x%x]\n",
-								status);
+		pr_err("ipc_read_config failed: status [0x%x]\n", status);
 
 	return status;
 }
@@ -1151,8 +1146,7 @@ int ipc_write_config(u16 remote_proc_id, u32 tag, void *cfg, u32 size)
 
 exit:
 	if (status < 0)
-		printk(KERN_ERR "ipc_write_config failed: status [0x%x]\n",
-								status);
+		pr_err("ipc_write_config failed: status [0x%x]\n", status);
 
 	return status;
 }
@@ -1270,8 +1264,7 @@ int ipc_start(void)
 
 exit:
 	if (status < 0)
-		printk(KERN_ERR "ipc_start failed: status [0x%x]\n",
-								status);
+		pr_err("ipc_start failed: status [0x%x]\n", status);
 
 	return status;
 }
@@ -1360,7 +1353,7 @@ int ipc_stop(void)
 	}
 exit:
 	if (status < 0)
-		printk(KERN_ERR "ipc_stop failed: status [0x%x]\n", status);
+		pr_err("ipc_stop failed: status [0x%x]\n", status);
 
 	return status;
 }
@@ -1393,9 +1386,7 @@ void ipc_get_config(struct ipc_config *cfg_params)
 
 exit:
 	if (status < 0)
-		printk(KERN_ERR "ipc_get_config failed: status [0x%x]\n",
-								status);
-
+		pr_err("ipc_get_config failed: status [0x%x]\n", status);
 }
 
 
@@ -1445,7 +1436,7 @@ int ipc_setup(const struct ipc_config *cfg)
 
 exit:
 	if (status < 0)
-		printk(KERN_ERR "ipc_setup failed: status [0x%x]\n", status);
+		pr_err("ipc_setup failed: status [0x%x]\n", status);
 
 	return status;
 }
@@ -1494,7 +1485,7 @@ int ipc_destroy(void)
 
 exit:
 	if (status < 0)
-		printk(KERN_ERR "ipc_destroy failed: status [0x%x]\n", status);
+		pr_err("ipc_destroy failed: status [0x%x]\n", status);
 
 	return status;
 }
diff --git a/drivers/dsp/syslink/multicore_ipc/ipc_drv.c b/drivers/dsp/syslink/multicore_ipc/ipc_drv.c
index e23f50b744d..8cf66d27661 100644
--- a/drivers/dsp/syslink/multicore_ipc/ipc_drv.c
+++ b/drivers/dsp/syslink/multicore_ipc/ipc_drv.c
@@ -369,14 +369,13 @@ static int __init ipc_init(void)
 	ipc_major = MAJOR(dev);
 
 	if (retval < 0) {
-		printk(KERN_ERR "ipc_init: can't get major %x\n", ipc_major);
+		pr_err("ipc_init: can't get major %x\n", ipc_major);
 		goto exit;
 	}
 
 	ipc_device = kmalloc(sizeof(struct ipc_device), GFP_KERNEL);
 	if (!ipc_device) {
-		printk(KERN_ERR "ipc_init: memory allocation failed for "
-			"ipc_device\n");
+		pr_err("ipc_init: memory allocation failed for ipc_device\n");
 		retval = -ENOMEM;
 		goto unreg_exit;
 	}
@@ -387,13 +386,13 @@ static int __init ipc_init(void)
 
 	retval = ipc_modules_init();
 	if (retval) {
-		printk(KERN_ERR "ipc_init: ipc initialization failed\n");
+		pr_err("ipc_init: ipc initialization failed\n");
 		goto unreg_exit;
 
 	}
 	ipc_class = class_create(THIS_MODULE, "syslink_ipc");
 	if (IS_ERR(ipc_class)) {
-		printk(KERN_ERR "ipc_init: error creating ipc class\n");
+		pr_err("ipc_init: error creating ipc class\n");
 		retval = PTR_ERR(ipc_class);
 		goto unreg_exit;
 	}
@@ -404,7 +403,7 @@ static int __init ipc_init(void)
 	ipc_device->cdev.owner = THIS_MODULE;
 	retval = cdev_add(&ipc_device->cdev, dev, IPC_DEVICES);
 	if (retval) {
-		printk(KERN_ERR "ipc_init: failed to add the ipc device\n");
+		pr_err("ipc_init: failed to add the ipc device\n");
 		goto class_exit;
 	}
 	return retval;
diff --git a/drivers/dsp/syslink/multicore_ipc/listmp.c b/drivers/dsp/syslink/multicore_ipc/listmp.c
index c96d8a635cb..db604edd450 100644
--- a/drivers/dsp/syslink/multicore_ipc/listmp.c
+++ b/drivers/dsp/syslink/multicore_ipc/listmp.c
@@ -150,10 +150,8 @@ void listmp_get_config(struct listmp_config *cfg_params)
 	}
 
 exit:
-	if (status < 0) {
-		printk(KERN_ERR "listmp_get_config failed: status = 0x%x\n",
-			status);
-	}
+	if (status < 0)
+		pr_err("listmp_get_config failed: status = 0x%x\n", status);
 	return;
 }
 
@@ -218,7 +216,7 @@ clean_nameserver:
 	WARN_ON(status1 < 0);
 	atomic_set(&listmp_module->ref_count, LISTMP_MAKE_MAGICSTAMP(0));
 exit:
-	printk(KERN_ERR "listmp_setup failed! status = 0x%x\n", status);
+	pr_err("listmp_setup failed! status = 0x%x\n", status);
 	return status;
 }
 
@@ -281,10 +279,8 @@ int listmp_destroy(void)
 	atomic_set(&listmp_module->ref_count, LISTMP_MAKE_MAGICSTAMP(0));
 
 exit:
-	if (status < 0) {
-		printk(KERN_ERR "listmp_destroy failed! status = 0x%x\n",
-			status);
-	}
+	if (status < 0)
+		pr_err("listmp_destroy failed! status = 0x%x\n", status);
 	return status;
 }
 
@@ -309,10 +305,8 @@ void listmp_params_init(struct listmp_params *params)
 		sizeof(struct listmp_params));
 
 exit:
-	if (status < 0) {
-		printk(KERN_ERR "listmp_params_init failed! status = 0x%x\n",
-			status);
-	}
+	if (status < 0)
+		pr_err("listmp_params_init failed! status = 0x%x\n", status);
 	return;
 }
 
@@ -344,10 +338,8 @@ void *listmp_create(const struct listmp_params *params)
 	mutex_unlock(listmp_module->local_lock);
 
 exit:
-	if (status < 0) {
-		printk(KERN_ERR "listmp_create failed! status = 0x%x\n",
-			status);
-	}
+	if (status < 0)
+		pr_err("listmp_create failed! status = 0x%x\n", status);
 	return (void *)obj;
 }
 
@@ -412,10 +404,8 @@ int listmp_delete(void **listmp_handleptr)
 	*listmp_handleptr = NULL;
 
 exit:
-	if (status < 0) {
-		printk(KERN_ERR "listmp_delete failed! status = 0x%x\n",
-			status);
-	}
+	if (status < 0)
+		pr_err("listmp_delete failed! status = 0x%x\n", status);
 	return status;
 }
 
@@ -497,7 +487,7 @@ int listmp_open(char *name, void **listmp_handleptr)
 
 exit:
 	if (status < 0)
-		printk(KERN_ERR "listmp_open failed! status = 0x%x\n", status);
+		pr_err("listmp_open failed! status = 0x%x\n", status);
 	return status;
 }
 
@@ -570,10 +560,8 @@ int listmp_open_by_addr(void *shared_addr, void **listmp_handleptr)
 	}
 
 exit:
-	if (status < 0) {
-		printk(KERN_ERR "listmp_open failed! "
-			"status = 0x%x\n", status);
-	}
+	if (status < 0)
+		pr_err("listmp_open failed! status = 0x%x\n", status);
 	return status;
 }
 
@@ -625,7 +613,7 @@ int listmp_close(void **listmp_handleptr)
 
 exit:
 	if (status < 0)
-		printk(KERN_ERR "listmp_close failed! status = 0x%x\n", status);
+		pr_err("listmp_close failed! status = 0x%x\n", status);
 	return status;
 }
 
@@ -693,10 +681,8 @@ void *listmp_get_gate(void *listmp_handle)
 	gatemp_handle = obj->gatemp_handle;
 
 exit:
-	if (retval < 0) {
-		printk(KERN_ERR "listmp_get_gate failed! status = 0x%x",
-			retval);
-	}
+	if (retval < 0)
+		pr_err("listmp_get_gate failed! status = 0x%x", retval);
 	return gatemp_handle;
 }
 
@@ -776,10 +762,9 @@ gate_leave_and_exit:
 	gatemp_leave(obj->gatemp_handle, key);
 
 exit:
-	if (retval < 0) {
-		printk(KERN_ERR "listmp_get_head failed! status = 0x%x",
-			retval);
-	}
+	if (retval < 0)
+		pr_err("listmp_get_head failed! status = 0x%x", retval);
+
 	return elem;
 }
 
@@ -862,10 +847,9 @@ gate_leave_and_exit:
 	gatemp_leave(obj->gatemp_handle, key);
 
 exit:
-	if (retval < 0) {
-		printk(KERN_ERR "listmp_get_tail failed! status = 0x%x",
-			retval);
-	}
+	if (retval < 0)
+		pr_err("listmp_get_tail failed! status = 0x%x", retval);
+
 	return elem;
 }
 
@@ -943,10 +927,8 @@ gate_leave_and_exit:
 	gatemp_leave(obj->gatemp_handle, key);
 
 exit:
-	if (status < 0) {
-		printk(KERN_ERR "listmp_put_head failed! status = 0x%x\n",
-			status);
-	}
+	if (status < 0)
+		pr_err("listmp_put_head failed! status = 0x%x\n", status);
 	return status;
 }
 
@@ -1031,10 +1013,8 @@ gate_leave_and_exit:
 	gatemp_leave(obj->gatemp_handle, key);
 
 exit:
-	if (status < 0) {
-		printk(KERN_ERR "listmp_put_tail failed! "
-			"status = 0x%x\n", status);
-	}
+	if (status < 0)
+		pr_err("listmp_put_tail failed! status = 0x%x\n", status);
 	return status;
 }
 
@@ -1121,10 +1101,8 @@ gate_leave_and_exit:
 	gatemp_leave(obj->gatemp_handle, key);
 
 exit:
-	if (status < 0) {
-		printk(KERN_ERR "listmp_insert failed! status = 0x%x\n",
-			status);
-	}
+	if (status < 0)
+		pr_err("listmp_insert failed! status = 0x%x\n", status);
 	return status;
 }
 
@@ -1189,10 +1167,8 @@ gate_leave_and_exit:
 	gatemp_leave(obj->gatemp_handle, key);
 
 exit:
-	if (status < 0) {
-		printk(KERN_ERR "listmp_remove failed! status = 0x%x\n",
-			status);
-	}
+	if (status < 0)
+		pr_err("listmp_remove failed! status = 0x%x\n", status);
 	return status;
 }
 
@@ -1232,7 +1208,7 @@ void *listmp_next(void *listmp_handle, struct listmp_elem *elem)
 
 exit:
 	if (status < 0)
-		printk(KERN_ERR "listmp_next failed! status = 0x%x\n", status);
+		pr_err("listmp_next failed! status = 0x%x\n", status);
 	return ret_elem;
 }
 
@@ -1272,7 +1248,7 @@ void *listmp_prev(void *listmp_handle, struct listmp_elem *elem)
 
 exit:
 	if (status < 0)
-		printk(KERN_ERR "listmp_prev failed! status = 0x%x\n", status);
+		pr_err("listmp_prev failed! status = 0x%x\n", status);
 	return ret_elem;
 }
 
@@ -1304,7 +1280,7 @@ uint listmp_shared_mem_req(const struct listmp_params *params)
 
 exit:
 	if (retval < 0) {
-		printk(KERN_ERR "listmp_shared_mem_req failed! status = 0x%x\n",
+		pr_err("listmp_shared_mem_req failed! status = 0x%x\n",
 			retval);
 	}
 	return mem_req;
@@ -1507,9 +1483,7 @@ error:
 	}
 
 exit:
-	if (status < 0) {
-		printk(KERN_ERR "_listmp_create failed! status = 0x%x\n",
-			status);
-	}
+	if (status < 0)
+		pr_err("_listmp_create failed! status = 0x%x\n", status);
 	return status;
 }
diff --git a/drivers/dsp/syslink/multicore_ipc/listmp_ioctl.c b/drivers/dsp/syslink/multicore_ipc/listmp_ioctl.c
index 730c324c87f..c4b68455d94 100644
--- a/drivers/dsp/syslink/multicore_ipc/listmp_ioctl.c
+++ b/drivers/dsp/syslink/multicore_ipc/listmp_ioctl.c
@@ -645,6 +645,6 @@ int listmp_ioctl(struct inode *inode, struct file *filp,
 	return status;
 
 exit:
-	printk(KERN_ERR "listmp_ioctl failed: status = 0x%x\n", status);
+	pr_err("listmp_ioctl failed: status = 0x%x\n", status);
 	return status;
 }
diff --git a/drivers/dsp/syslink/multicore_ipc/messageq.c b/drivers/dsp/syslink/multicore_ipc/messageq.c
index 332288c8142..83f3d8e7d8e 100644
--- a/drivers/dsp/syslink/multicore_ipc/messageq.c
+++ b/drivers/dsp/syslink/multicore_ipc/messageq.c
@@ -256,7 +256,7 @@ void messageq_get_config(struct messageq_config *cfg)
 	return;
 
 exit:
-	printk(KERN_ERR "messageq_get_config: Argument of type "
+	pr_err("messageq_get_config: Argument of type "
 		"(struct messageq_config *) passed is null!\n");
 }
 EXPORT_SYMBOL(messageq_get_config);
@@ -315,8 +315,7 @@ int messageq_setup(const struct messageq_config *cfg)
 	if (unlikely(messageq_module->gate_handle == NULL)) {
 		/*! @retval MESSAGEQ_E_FAIL Failed to create lock! */
 		status = MESSAGEQ_E_FAIL;
-		printk(KERN_ERR "messageq_setup: Failed to create a "
-			"mutex.\n");
+		pr_err("messageq_setup: Failed to create a mutex.\n");
 		status = -ENOMEM;
 		goto exit;
 	}
@@ -339,7 +338,7 @@ int messageq_setup(const struct messageq_config *cfg)
 		/*! @retval MESSAGEQ_E_FAIL Failed to create the
 		 * MessageQ nameserver*/
 		status = MESSAGEQ_E_FAIL;
-		printk(KERN_ERR "messageq_setup: Failed to create the messageq"
+		pr_err("messageq_setup: Failed to create the messageq"
 			"nameserver!\n");
 		goto exit;
 	}
@@ -368,8 +367,7 @@ int messageq_setup(const struct messageq_config *cfg)
 exit:
 	if (status < 0) {
 		messageq_destroy();
-		printk(KERN_ERR "messageq_setup failed! status = 0x%x\n",
-			status);
+		pr_err("messageq_setup failed! status = 0x%x\n", status);
 	}
 	return status;
 }
@@ -405,7 +403,7 @@ int messageq_destroy(void)
 				messageq_delete(&(messageq_module->queues[i]));
 			if (unlikely(tmp_status < 0 && status >= 0)) {
 				status = tmp_status;
-				printk(KERN_ERR "messageq_destroy: "
+				pr_err("messageq_destroy: "
 					"messageq_delete failed for queue %d",
 					i);
 			}
@@ -417,8 +415,7 @@ int messageq_destroy(void)
 		tmp_status = nameserver_delete(&messageq_module->ns_handle);
 		if (unlikely(tmp_status < 0 && status >= 0)) {
 			status = tmp_status;
-			printk(KERN_ERR "messageq_destroy: "
-				"nameserver_delete failed");
+			pr_err("messageq_destroy: nameserver_delete failed");
 		}
 	}
 
@@ -446,10 +443,8 @@ int messageq_destroy(void)
 	atomic_set(&messageq_module->ref_count, MESSAGEQ_MAKE_MAGICSTAMP(0));
 
 exit:
-	if (status < 0) {
-		printk(KERN_ERR "messageq_destroy failed! status = 0x%x\n",
-			status);
-	}
+	if (status < 0)
+		pr_err("messageq_destroy failed! status = 0x%x\n", status);
 	return status;
 }
 EXPORT_SYMBOL(messageq_destroy);
@@ -463,7 +458,7 @@ void messageq_params_init(struct messageq_params *params)
 				MESSAGEQ_MAKE_MAGICSTAMP(1)) == true))
 		goto exit;
 	if (WARN_ON(unlikely(params == NULL))) {
-		printk(KERN_ERR "messageq_params_init failed:Argument of "
+		pr_err("messageq_params_init failed:Argument of "
 			"type(messageq_params *) is NULL!\n");
 		goto exit;
 	}
@@ -526,7 +521,7 @@ void *messageq_create(char *name, const struct messageq_params *params)
 		if (unlikely(queueIndex == MESSAGEQ_INVALIDMESSAGEQ)) {
 			mutex_unlock(messageq_module->gate_handle);
 			status = MESSAGEQ_E_FAIL;
-			printk(KERN_ERR "messageq_create: Failed to grow the "
+			pr_err("messageq_create: Failed to grow the "
 				"queue array!");
 			goto exit;
 		}
@@ -551,7 +546,7 @@ void *messageq_create(char *name, const struct messageq_params *params)
 	if (unlikely(obj->synchronizer == NULL)) {
 		mutex_unlock(messageq_module->gate_handle);
 		status = MESSAGEQ_E_FAIL;
-		printk(KERN_ERR "messageq_create: Failed to create "
+		pr_err("messageq_create: Failed to create "
 			"synchronizer semaphore!\n");
 		goto exit;
 	} else {
@@ -570,7 +565,7 @@ void *messageq_create(char *name, const struct messageq_params *params)
 						name, obj->queue);
 		if (unlikely(obj->ns_key == NULL)) {
 			status = MESSAGEQ_E_FAIL;
-			printk(KERN_ERR "messageq_create: Failed to add "
+			pr_err("messageq_create: Failed to add "
 				"the messageq name!\n");
 		}
 	}
@@ -581,8 +576,7 @@ void *messageq_create(char *name, const struct messageq_params *params)
 exit:
 	if (unlikely(status < 0)) {
 		messageq_delete((void **)&obj);
-		printk(KERN_ERR "messageq_create failed! status = 0x%x\n",
-			status);
+		pr_err("messageq_create failed! status = 0x%x\n", status);
 	}
 	return (void *) obj;
 }
@@ -624,7 +618,7 @@ int messageq_delete(void **msg_handleptr)
 		status = nameserver_remove_entry(messageq_module->ns_handle,
 			obj->ns_key);
 		if (unlikely(status < 0)) {
-			printk(KERN_ERR "messageq_delete: nameserver_remove_"
+			pr_err("messageq_delete: nameserver_remove_"
 				"entry failed! status = 0x%x", status);
 		}
 	}
@@ -640,7 +634,7 @@ int messageq_delete(void **msg_handleptr)
 		tmp_status = messageq_free(temp_msg);
 		if (unlikely((tmp_status < 0) && (status >= 0))) {
 			status = tmp_status;
-			printk(KERN_ERR "messageq_delete: messageq_free failed"
+			pr_err("messageq_delete: messageq_free failed"
 				" for normal_list!");
 		}
 	}
@@ -657,7 +651,7 @@ int messageq_delete(void **msg_handleptr)
 		tmp_status = messageq_free(temp_msg);
 		if (unlikely((tmp_status < 0) && (status >= 0))) {
 			status = tmp_status;
-			printk(KERN_ERR "messageq_delete: messageq_free failed"
+			pr_err("messageq_delete: messageq_free failed"
 				" for high_list!");
 		}
 	}
@@ -680,10 +674,8 @@ int messageq_delete(void **msg_handleptr)
 	*msg_handleptr = NULL;
 
 exit:
-	if (status < 0) {
-		printk(KERN_ERR "messageq_delete failed! status = 0x%x\n",
-			status);;
-	}
+	if (status < 0)
+		pr_err("messageq_delete failed! status = 0x%x\n", status);
 	return status;
 }
 EXPORT_SYMBOL(messageq_delete);
@@ -715,10 +707,8 @@ int messageq_open(char *name, u32 *queue_id)
 					queue_id, NULL);
 
 exit:
-	if (status < 0) {
-		printk(KERN_ERR "messageq_open failed! status = 0x%x\n",
-			status);
-	}
+	if (status < 0)
+		pr_err("messageq_open failed! status = 0x%x\n", status);
 	return status;
 }
 EXPORT_SYMBOL(messageq_open);
@@ -736,7 +726,7 @@ int messageq_close(u32 *queue_id)
 		goto exit;
 	}
 	if (WARN_ON(unlikely(queue_id == NULL))) {
-		printk(KERN_ERR "messageq_close: queue_id passed is NULL!\n");
+		pr_err("messageq_close: queue_id passed is NULL!\n");
 		status = -EINVAL;
 		goto exit;
 	}
@@ -744,10 +734,8 @@ int messageq_close(u32 *queue_id)
 	*queue_id = MESSAGEQ_INVALIDMESSAGEQ;
 
 exit:
-	if (status < 0) {
-		printk(KERN_ERR "messageq_close failed! status = 0x%x\n",
-			status);
-	}
+	if (status < 0)
+		pr_err("messageq_close failed! status = 0x%x\n", status);
 	return status;
 }
 EXPORT_SYMBOL(messageq_close);
@@ -842,12 +830,12 @@ exit:
 	if (unlikely((messageq_module->cfg.trace_flag == true) && \
 		((*msg != NULL) && \
 		(((*msg)->flags & MESSAGEQ_TRACEMASK) != 0)))) {
-		printk(KERN_INFO "messageq_get: *msg = 0x%x seq_num = 0x%x "
+		pr_info("messageq_get: *msg = 0x%x seq_num = 0x%x "
 			"src_proc = 0x%x obj = 0x%x\n", (uint)(*msg),
 			((*msg)->seq_num), ((*msg)->src_proc), (uint)(obj));
 	}
 	if (status < 0 && status != -ETIME)
-		printk(KERN_ERR "messageq_get failed! status = 0x%x\n", status);
+		pr_err("messageq_get failed! status = 0x%x\n", status);
 	return status;
 }
 EXPORT_SYMBOL(messageq_get);
@@ -870,7 +858,7 @@ int messageq_count(void *messageq_handle)
 	}
 	if (WARN_ON(obj == NULL)) {
 		status = -EINVAL;
-		printk(KERN_ERR "messageq_count: obj passed is NULL!\n");
+		pr_err("messageq_count: obj passed is NULL!\n");
 		goto exit;
 	}
 
@@ -888,7 +876,7 @@ int messageq_count(void *messageq_handle)
 
 exit:
 	if (status < 0)
-		printk(KERN_ERR "messageq_count failed! status = 0x%x", status);
+		pr_err("messageq_count failed! status = 0x%x", status);
 	return count;
 }
 EXPORT_SYMBOL(messageq_count);
@@ -906,7 +894,7 @@ void messageq_static_msg_init(messageq_msg msg, u32 size)
 		goto exit;
 	}
 	if (WARN_ON(msg == NULL)) {
-		printk(KERN_ERR "messageq_static_msg_init: msg is invalid!\n");
+		pr_err("messageq_static_msg_init: msg is invalid!\n");
 		goto exit;
 	}
 
@@ -917,14 +905,14 @@ void messageq_static_msg_init(messageq_msg msg, u32 size)
 
 	if (unlikely((messageq_module->cfg.trace_flag == true) || \
 		(((*msg).flags & MESSAGEQ_TRACEMASK) != 0))) {
-		printk(KERN_INFO "messageq_static_msg_init: msg = 0x%x "
+		pr_info("messageq_static_msg_init: msg = 0x%x "
 			"seq_num = 0x%x src_proc = 0x%x", (uint)(msg),
 			(msg)->seq_num, (msg)->src_proc);
 	}
 
 exit:
 	if (status < 0) {
-		printk(KERN_ERR "messageq_static_msg_init failed! "
+		pr_err("messageq_static_msg_init failed! "
 			"status = 0x%x", status);
 	}
 	return;
@@ -969,14 +957,14 @@ messageq_msg messageq_alloc(u16 heap_id, u32 size)
 
 	if (unlikely((messageq_module->cfg.trace_flag == true) || \
 		(((*msg).flags & MESSAGEQ_TRACEMASK) != 0))) {
-		printk(KERN_INFO "messageq_alloc: msg = 0x%x seq_num = 0x%x "
+		pr_info("messageq_alloc: msg = 0x%x seq_num = 0x%x "
 			"src_proc = 0x%x", (uint)(msg), (msg)->seq_num,
 			(msg)->src_proc);
 	}
 
 exit:
 	if (status < 0)
-		printk(KERN_ERR "messageq_alloc failed! status = 0x%x", status);
+		pr_err("messageq_alloc failed! status = 0x%x", status);
 	return msg;
 }
 EXPORT_SYMBOL(messageq_alloc);
@@ -1013,7 +1001,7 @@ int messageq_free(messageq_msg msg)
 
 	if (unlikely((messageq_module->cfg.trace_flag == true) || \
 		(((*msg).flags & MESSAGEQ_TRACEMASK) != 0))) {
-		printk(KERN_INFO "messageq_free: msg = 0x%x seq_num = 0x%x "
+		pr_info("messageq_free: msg = 0x%x seq_num = 0x%x "
 			"src_proc = 0x%x", (uint)(msg), (msg)->seq_num,
 			(msg)->src_proc);
 	}
@@ -1021,10 +1009,8 @@ int messageq_free(messageq_msg msg)
 	sl_heap_free(heap, msg, msg->msg_size);
 
 exit:
-	if (status < 0) {
-		printk(KERN_ERR "messageq_free failed! status = 0x%x\n",
-			status);
-	}
+	if (status < 0)
+		pr_err("messageq_free failed! status = 0x%x\n", status);
 	return status;
 }
 EXPORT_SYMBOL(messageq_free);
@@ -1115,14 +1101,14 @@ int messageq_put(u32 queue_id, messageq_msg msg)
 	}
 	if (unlikely((messageq_module->cfg.trace_flag == true) || \
 		(((*msg).flags & MESSAGEQ_TRACEMASK) != 0))) {
-		printk(KERN_INFO "messageq_put: msg = 0x%x seq_num = 0x%x "
+		pr_info("messageq_put: msg = 0x%x seq_num = 0x%x "
 			"src_proc = 0x%x dst_proc_id = 0x%x\n", (uint)(msg),
 			(msg)->seq_num, (msg)->src_proc, (msg)->dst_proc);
 	}
 
 exit:
 	if (status < 0)
-		printk(KERN_ERR "messageq_put failed! status = 0x%x\n", status);
+		pr_err("messageq_put failed! status = 0x%x\n", status);
 	return status;
 }
 EXPORT_SYMBOL(messageq_put);
@@ -1165,7 +1151,7 @@ int messageq_register_heap(void *heap_handle, u16 heap_id)
 
 exit:
 	if (status < 0) {
-		printk(KERN_ERR "messageq_register_heap failed! "
+		pr_err("messageq_register_heap failed! "
 			"status = 0x%x\n", status);
 	}
 	return status;
@@ -1200,7 +1186,7 @@ int messageq_unregister_heap(u16 heap_id)
 
 exit:
 	if (status < 0) {
-		printk(KERN_ERR "messageq_unregister_heap failed! "
+		pr_err("messageq_unregister_heap failed! "
 			"status = 0x%x\n", status);
 	}
 	return status;
@@ -1274,7 +1260,7 @@ int messageq_register_transport(void *messageq_transportshm_handle,
 
 exit:
 	if (status < 0) {
-		printk(KERN_ERR "messageq_register_transport failed! "
+		pr_err("messageq_register_transport failed! "
 			"status = 0x%x\n", status);
 	}
 	return status;
@@ -1308,7 +1294,7 @@ void messageq_unregister_transport(u16 proc_id, u32 priority)
 
 exit:
 	if (status < 0) {
-		printk(KERN_ERR "messageq_unregister_transport failed! "
+		pr_err("messageq_unregister_transport failed! "
 			"status = 0x%x\n", status);
 	}
 	return;
@@ -1337,8 +1323,7 @@ void messageq_set_reply_queue(void *messageq_handle, messageq_msg msg)
 	return;
 
 exit:
-	printk(KERN_ERR "messageq_set_reply_queue failed: status = 0x%x",
-		status);
+	pr_err("messageq_set_reply_queue failed: status = 0x%x", status);
 	return;
 }
 EXPORT_SYMBOL(messageq_set_reply_queue);
@@ -1351,7 +1336,7 @@ u32 messageq_get_queue_id(void *messageq_handle)
 	u32 queue_id = MESSAGEQ_INVALIDMESSAGEQ;
 
 	if (WARN_ON(unlikely(obj == NULL))) {
-		printk(KERN_ERR "messageq_get_queue_id: obj passed is NULL!\n");
+		pr_err("messageq_get_queue_id: obj passed is NULL!\n");
 		goto exit;
 	}
 
@@ -1370,7 +1355,7 @@ u16 messageq_get_proc_id(void *messageq_handle)
 	u16 proc_id = MULTIPROC_INVALIDID;
 
 	if (WARN_ON(unlikely(obj == NULL))) {
-		printk(KERN_ERR "messageq_get_proc_id: obj passed is NULL!\n");
+		pr_err("messageq_get_proc_id: obj passed is NULL!\n");
 		goto exit;
 	}
 
@@ -1387,8 +1372,7 @@ u32 messageq_get_dst_queue(messageq_msg msg)
 	u32 queue_id = MESSAGEQ_INVALIDMESSAGEQ;
 
 	if (WARN_ON(unlikely(msg == NULL))) {
-		printk(KERN_ERR "messageq_get_dst_queue: msg passed is "
-			"NULL!\n");
+		pr_err("messageq_get_dst_queue: msg passed is NULL!\n");
 		goto exit;
 	}
 
@@ -1407,7 +1391,7 @@ u16 messageq_get_msg_id(messageq_msg msg)
 	u16 id = MESSAGEQ_INVALIDMSGID;
 
 	if (WARN_ON(unlikely(msg == NULL))) {
-		printk(KERN_ERR "messageq_get_msg_id: msg passed is NULL!\n");
+		pr_err("messageq_get_msg_id: msg passed is NULL!\n");
 		goto exit;
 	}
 
@@ -1424,7 +1408,7 @@ u32 messageq_get_msg_size(messageq_msg msg)
 	u32 size = 0;
 
 	if (WARN_ON(unlikely(msg == NULL))) {
-		printk(KERN_ERR "messageq_get_msg_size: msg passed is NULL!\n");
+		pr_err("messageq_get_msg_size: msg passed is NULL!\n");
 		goto exit;
 	}
 
@@ -1441,7 +1425,7 @@ u32 messageq_get_msg_pri(messageq_msg msg)
 	u32 priority = MESSAGEQ_NORMALPRI;
 
 	if (WARN_ON(unlikely(msg == NULL))) {
-		printk(KERN_ERR "messageq_get_msg_pri: msg passed is NULL!\n");
+		pr_err("messageq_get_msg_pri: msg passed is NULL!\n");
 		goto exit;
 	}
 
@@ -1458,8 +1442,7 @@ u32 messageq_get_reply_queue(messageq_msg msg)
 	u32 queue = MESSAGEQ_INVALIDMESSAGEQ;
 
 	if (WARN_ON(unlikely(msg == NULL))) {
-		printk(KERN_ERR "messageq_get_reply_queue: msg passed is "
-			"NULL!\n");
+		pr_err("messageq_get_reply_queue: msg passed is NULL!\n");
 		goto exit;
 	}
 
@@ -1475,7 +1458,7 @@ EXPORT_SYMBOL(messageq_get_reply_queue);
 void messageq_set_msg_id(messageq_msg msg, u16 msg_id)
 {
 	if (WARN_ON(unlikely(msg == NULL))) {
-		printk(KERN_ERR "messageq_set_msg_id: msg passed is NULL!\n");
+		pr_err("messageq_set_msg_id: msg passed is NULL!\n");
 		goto exit;
 	}
 
@@ -1490,7 +1473,7 @@ EXPORT_SYMBOL(messageq_set_msg_id);
 void messageq_set_msg_pri(messageq_msg msg, u32 priority)
 {
 	if (WARN_ON(unlikely(msg == NULL))) {
-		printk(KERN_ERR "messageq_set_msg_pri: msg passed is NULL!\n");
+		pr_err("messageq_set_msg_pri: msg passed is NULL!\n");
 		goto exit;
 	}
 
@@ -1505,15 +1488,14 @@ EXPORT_SYMBOL(messageq_set_msg_pri);
 void messageq_set_msg_trace(messageq_msg msg, bool trace_flag)
 {
 	if (WARN_ON(unlikely(msg == NULL))) {
-		printk(KERN_ERR "messageq_set_msg_trace: msg passed is "
-			"NULL!\n");
+		pr_err("messageq_set_msg_trace: msg passed is NULL!\n");
 		goto exit;
 	}
 
 	msg->flags = (msg->flags & ~MESSAGEQ_TRACEMASK) | \
 			(trace_flag << MESSAGEQ_TRACESHIFT);
 
-	printk(KERN_INFO "messageq_set_msg_trace: msg = 0x%x, seq_num = 0x%x"
+	pr_info("messageq_set_msg_trace: msg = 0x%x, seq_num = 0x%x"
 			"src_proc = 0x%x trace_flag = 0x%x", (uint)msg,
 			msg->seq_num, msg->src_proc, trace_flag);
 exit:
@@ -1553,7 +1535,7 @@ int messageq_attach(u16 remote_proc_id, void *shared_addr)
 		status = messageq_setup_transport_proxy_attach(
 						remote_proc_id, shared_addr);
 		if (status < 0) {
-			printk(KERN_ERR "messageq_attach failed in transport"
+			pr_err("messageq_attach failed in transport"
 					"setup, status = 0x%x", status);
 		}
 	}
@@ -1573,7 +1555,7 @@ int messageq_detach(u16 remote_proc_id)
 		 * transports */
 		status = messageq_setup_transport_proxy_detach(remote_proc_id);
 		if (unlikely(status < 0)) {
-			printk(KERN_ERR "messageq_detach failed in transport"
+			pr_err("messageq_detach failed in transport"
 					"detach, status = 0x%x", status);
 		}
 	}
@@ -1601,8 +1583,7 @@ static u16 _messageq_grow(struct messageq_object *obj)
 	queues = kmalloc(old_size + sizeof(struct messageq_object *),
 				GFP_KERNEL);
 	if (queues == NULL) {
-		printk(KERN_ERR "_messageq_grow: Growing the messageq "
-			"failed!\n");
+		pr_err("_messageq_grow: Growing the messageq failed!\n");
 		goto exit;
 	}
 
@@ -1656,9 +1637,7 @@ static void messageq_msg_init(messageq_msg msg)
 	mutex_unlock(messageq_module->gate_handle);
 
 exit:
-	if (status < 0) {
-		printk(KERN_ERR "messageq_msg_init: Invalid NULL msg "
-			"specified!\n");
-	}
+	if (status < 0)
+		pr_err("messageq_msg_init: Invalid NULL msg specified!\n");
 	return;
 }
diff --git a/drivers/dsp/syslink/multicore_ipc/messageq_ioctl.c b/drivers/dsp/syslink/multicore_ipc/messageq_ioctl.c
index 5a16d2c7d1f..0d3195f06f5 100644
--- a/drivers/dsp/syslink/multicore_ipc/messageq_ioctl.c
+++ b/drivers/dsp/syslink/multicore_ipc/messageq_ioctl.c
@@ -730,6 +730,6 @@ int messageq_ioctl(struct inode *inode, struct file *filp,
 	return status;
 
 exit:
-	printk(KERN_ERR "messageq_ioctl failed: status = 0x%x\n", status);
+	pr_err("messageq_ioctl failed: status = 0x%x\n", status);
 	return status;
 }
diff --git a/drivers/dsp/syslink/multicore_ipc/nameserver.c b/drivers/dsp/syslink/multicore_ipc/nameserver.c
index b89f96a551a..c164b78630b 100644
--- a/drivers/dsp/syslink/multicore_ipc/nameserver.c
+++ b/drivers/dsp/syslink/multicore_ipc/nameserver.c
@@ -257,10 +257,8 @@ void nameserver_get_config(struct nameserver_config *cfg)
 	}
 
 exit:
-	if (retval < 0) {
-		printk(KERN_ERR "nameserver_get_config failed! retval = 0x%x",
-			retval);
-	}
+	if (retval < 0)
+		pr_err("nameserver_get_config failed! retval = 0x%x", retval);
 	return;
 }
 EXPORT_SYMBOL(nameserver_get_config);
@@ -310,7 +308,7 @@ int nameserver_setup(void)
 remote_alloc_fail:
 	kfree(nameserver_module->mod_gate_handle);
 exit:
-	printk(KERN_ERR "nameserver_setup failed, retval: %x\n", retval);
+	pr_err("nameserver_setup failed, retval: %x\n", retval);
 	return retval;
 }
 EXPORT_SYMBOL(nameserver_setup);
@@ -359,10 +357,8 @@ int nameserver_destroy(void)
 	return 0;
 
 exit:
-	if (retval < 0) {
-		printk(KERN_ERR "nameserver_destroy failed, retval: %x\n",
-			retval);
-	}
+	if (retval < 0)
+		pr_err("nameserver_destroy failed, retval: %x\n", retval);
 	return retval;
 }
 EXPORT_SYMBOL(nameserver_destroy);
@@ -389,10 +385,8 @@ void nameserver_params_init(struct nameserver_params *params)
 		sizeof(struct nameserver_params));
 
 exit:
-	if (retval < 0) {
-		printk(KERN_ERR "nameserver_params_init failed! status = 0x%x",
-			retval);
-	}
+	if (retval < 0)
+		pr_err("nameserver_params_init failed! status = 0x%x", retval);
 	return;
 }
 EXPORT_SYMBOL(nameserver_params_init);
@@ -479,7 +473,7 @@ error:
 error_handle:
 	mutex_unlock(nameserver_module->mod_gate_handle);
 exit:
-	printk(KERN_ERR "nameserver_create failed retval:%x\n", retval);
+	pr_err("nameserver_create failed retval:%x\n", retval);
 	return NULL;
 }
 EXPORT_SYMBOL(nameserver_create);
@@ -567,10 +561,8 @@ void nameserver_construct(void *handle, const char *name,
 	mutex_unlock(nameserver_module->mod_gate_handle);
 
 exit:
-	if (retval < 0) {
-		printk(KERN_ERR "nameserver_construct failed! retval = 0x%x",
-			retval);
-	}
+	if (retval < 0)
+		pr_err("nameserver_construct failed! retval = 0x%x", retval);
 	return;
 }
 
@@ -636,7 +628,7 @@ int nameserver_delete(void **handle)
 error:
 	mutex_unlock(gate_handle);
 exit:
-	printk(KERN_ERR "nameserver_delete failed retval:%x\n", retval);
+	pr_err("nameserver_delete failed retval:%x\n", retval);
 	return retval;
 }
 EXPORT_SYMBOL(nameserver_delete);
@@ -703,7 +695,7 @@ error:
 	mutex_unlock(obj->gate_handle);
 
 exit:
-	printk(KERN_ERR "nameserver_destruct failed! status = 0x%x", retval);
+	pr_err("nameserver_destruct failed! status = 0x%x", retval);
 	return;
 }
 
@@ -814,7 +806,7 @@ error_name:
 error:
 	mutex_unlock(temp_obj->gate_handle);
 exit:
-	printk(KERN_ERR "nameserver_add failed status: %x\n", retval);
+	pr_err("nameserver_add failed status: %x\n", retval);
 	return NULL;
 }
 EXPORT_SYMBOL(nameserver_add);
@@ -846,7 +838,7 @@ void *nameserver_add_uint32(void *handle, const char *name,
 
 exit:
 	if (retval < 0 || new_node == NULL) {
-		printk(KERN_ERR "nameserver_add_uint32 failed! status = 0x%x "
+		pr_err("nameserver_add_uint32 failed! status = 0x%x "
 			"new_node = 0x%x", retval, (u32)new_node);
 	}
 	return new_node;
@@ -947,7 +939,7 @@ int nameserver_remove(void *handle, const char *name)
 error:
 	mutex_unlock(temp_obj->gate_handle);
 exit:
-	printk(KERN_ERR "nameserver_remove failed status:%x\n", retval);
+	pr_err("nameserver_remove failed status:%x\n", retval);
 	return retval;
 }
 EXPORT_SYMBOL(nameserver_remove);
@@ -990,7 +982,7 @@ int nameserver_remove_entry(void *nshandle, void *nsentry)
 	return 0;
 
 exit:
-	printk(KERN_ERR "nameserver_remove_entry failed status:%x\n", retval);
+	pr_err("nameserver_remove_entry failed status:%x\n", retval);
 	return retval;
 }
 EXPORT_SYMBOL(nameserver_remove_entry);
@@ -1071,7 +1063,7 @@ error:
 
 exit:
 	if (retval < 0)
-		printk(KERN_ERR "nameserver_get_local entry not found!\n");
+		pr_err("nameserver_get_local entry not found!\n");
 	return retval;
 }
 EXPORT_SYMBOL(nameserver_get_local);
@@ -1163,7 +1155,7 @@ int nameserver_get(void *handle, const char *name,
 
 exit:
 	if (retval < 0)
-		printk(KERN_ERR "nameserver_get failed: status=%x\n", retval);
+		pr_err("nameserver_get failed: status=%x\n", retval);
 	return retval;
 }
 EXPORT_SYMBOL(nameserver_get);
@@ -1200,10 +1192,8 @@ int nameserver_get_uint32(void *handle, const char *name, void *value,
 
 exit:
 	/* -ENOENT is a valid run-time failure. */
-	if ((retval < 0) && (retval != -ENOENT)) {
-		printk(KERN_ERR "nameserver_get_uint32 failed! status = 0x%x",
-			retval);
-	}
+	if ((retval < 0) && (retval != -ENOENT))
+		pr_err("nameserver_get_uint32 failed! status = 0x%x", retval);
 	return retval;
 }
 EXPORT_SYMBOL(nameserver_get_uint32);
@@ -1248,7 +1238,7 @@ int nameserver_get_local_uint32(void *handle, const char *name, void *value)
 exit:
 	/* -ENOENT is a valid run-time failure. */
 	if ((retval < 0) && (retval != -ENOENT)) {
-		printk(KERN_ERR "nameserver_get_local_uint32 failed! "
+		pr_err("nameserver_get_local_uint32 failed! "
 			"status = 0x%x", retval);
 	}
 	return retval;
@@ -1310,7 +1300,7 @@ int nameserver_match(void *handle, const char *name, u32 *value)
 
 exit:
 	if (retval < 0)
-		printk(KERN_ERR "nameserver_match failed status:%x\n", retval);
+		pr_err("nameserver_match failed status:%x\n", retval);
 	return found_len;
 }
 EXPORT_SYMBOL(nameserver_match);
@@ -1347,7 +1337,7 @@ void *nameserver_get_handle(const char *name)
 	return (void *)obj;
 
 exit:
-	printk(KERN_ERR "nameserver_get_handle failed! status = 0x%x", retval);
+	pr_err("nameserver_get_handle failed! status = 0x%x", retval);
 	return (void *)NULL;
 }
 EXPORT_SYMBOL(nameserver_get_handle);
@@ -1385,7 +1375,7 @@ int nameserver_register_remote_driver(void *handle, u16 proc_id)
 	return 0;
 
 exit:
-	printk(KERN_ERR "nameserver_register_remote_driver failed! "
+	pr_err("nameserver_register_remote_driver failed! "
 		"status:%x\n", retval);
 	return retval;
 }
@@ -1415,7 +1405,7 @@ int nameserver_unregister_remote_driver(u16 proc_id)
 	return 0;
 
 exit:
-	printk(KERN_ERR "nameserver_unregister_remote_driver failed! "
+	pr_err("nameserver_unregister_remote_driver failed! "
 		"status:%x\n", retval);
 	return retval;
 }
@@ -1443,7 +1433,7 @@ bool nameserver_is_registered(u16 proc_id)
 
 exit:
 	if (retval < 0) {
-		printk(KERN_ERR "nameserver_is_registered failed! "
+		pr_err("nameserver_is_registered failed! "
 			"status = 0x%x", retval);
 	}
 	return registered;
diff --git a/drivers/dsp/syslink/multicore_ipc/nameserver_remote.c b/drivers/dsp/syslink/multicore_ipc/nameserver_remote.c
index adc949927c9..b958227d40c 100644
--- a/drivers/dsp/syslink/multicore_ipc/nameserver_remote.c
+++ b/drivers/dsp/syslink/multicore_ipc/nameserver_remote.c
@@ -40,9 +40,7 @@ int nameserver_remote_get(const struct nameserver_remote_object *handle,
 						name, value, value_len, NULL);
 
 exit:
-	if (retval < 0) {
-		printk(KERN_ERR "nameserver_remote_get failed! status = 0x%x",
-			retval);
-	}
+	if (retval < 0)
+		pr_err("nameserver_remote_get failed! status = 0x%x", retval);
 	return retval;
 }
diff --git a/drivers/dsp/syslink/multicore_ipc/nameserver_remotenotify.c b/drivers/dsp/syslink/multicore_ipc/nameserver_remotenotify.c
index dda0a5eb5c0..7584fdbf170 100644
--- a/drivers/dsp/syslink/multicore_ipc/nameserver_remotenotify.c
+++ b/drivers/dsp/syslink/multicore_ipc/nameserver_remotenotify.c
@@ -151,7 +151,7 @@ void nameserver_remotenotify_get_config(
 
 exit:
 	if (retval < 0) {
-		printk(KERN_ERR "nameserver_remotenotify_get_config failed!"
+		pr_err("nameserver_remotenotify_get_config failed!"
 			" retval = 0x%x", retval);
 	}
 	return;
@@ -212,7 +212,7 @@ int nameserver_remotenotify_setup(struct nameserver_remotenotify_config *cfg)
 	return 0;
 
 exit:
-	printk(KERN_ERR "nameserver_remotenotify_setup failed! retval = 0x%x",
+	pr_err("nameserver_remotenotify_setup failed! retval = 0x%x",
 		retval);
 	return retval;
 }
@@ -248,7 +248,7 @@ int nameserver_remotenotify_destroy(void)
 	return 0;
 
 exit:
-	printk(KERN_ERR "nameserver_remotenotify_destroy failed! retval = 0x%x",
+	pr_err("nameserver_remotenotify_destroy failed! retval = 0x%x",
 		retval);
 	return retval;
 }
@@ -262,13 +262,13 @@ void nameserver_remotenotify_params_init(
 			&(nameserver_remotenotify_state.ref_count),
 			NAMESERVERREMOTENOTIFY_MAKE_MAGICSTAMP(0),
 			NAMESERVERREMOTENOTIFY_MAKE_MAGICSTAMP(1)) == true))) {
-		printk(KERN_ERR "nameserver_remotenotify_params_init failed: "
+		pr_err("nameserver_remotenotify_params_init failed: "
 			"Module is not initialized!\n");
 		return;
 	}
 
 	if (WARN_ON(unlikely(params == NULL))) {
-		printk(KERN_ERR "nameserver_remotenotify_params_init failed: "
+		pr_err("nameserver_remotenotify_params_init failed: "
 			"Argument of type(nameserver_remotenotify_params *) "
 			"is NULL!\n");
 		return;
@@ -377,7 +377,7 @@ signal_response:
 
 exit:
 	if (retval < 0) {
-		printk(KERN_ERR "nameserver_remotenotify_callback failed! "
+		pr_err("nameserver_remotenotify_callback failed! "
 			"status = 0x%x\n", retval);
 	}
 	return;
@@ -520,7 +520,7 @@ down_error:
 	mutex_unlock(obj->local_gate);
 exit:
 	if (retval < 0)
-		printk(KERN_ERR "nameserver_remotenotify_get failed! "
+		pr_err("nameserver_remotenotify_get failed! "
 			"status = 0x%x", retval);
 	return retval;
 }
@@ -646,7 +646,7 @@ mem_error:
 	kfree(handle);
 
 exit:
-	printk(KERN_ERR "nameserver_remotenotify_create failed! "
+	pr_err("nameserver_remotenotify_create failed! "
 		"status = 0x%x\n", retval);
 	return NULL;
 }
@@ -708,7 +708,7 @@ free_handle:
 
 exit:
 	if (retval < 0) {
-		printk(KERN_ERR "nameserver_remotenotify_delete failed! "
+		pr_err("nameserver_remotenotify_delete failed! "
 			"status = 0x%x\n", retval);
 	}
 	return retval;
@@ -776,7 +776,7 @@ int nameserver_remotenotify_attach(u16 remote_proc_id, void *shared_addr)
 	return 0;
 
 exit:
-	printk(KERN_ERR "nameserver_remotenotify_attach failed! status = 0x%x",
+	pr_err("nameserver_remotenotify_attach failed! status = 0x%x",
 		retval);
 	return retval;
 }
@@ -818,7 +818,7 @@ int nameserver_remotenotify_detach(u16 remote_proc_id)
 	return 0;
 
 exit:
-	printk(KERN_ERR "nameserver_remotenotify_detach failed! status = 0x%x",
+	pr_err("nameserver_remotenotify_detach failed! status = 0x%x",
 		retval);
 	return retval;
 }
diff --git a/drivers/dsp/syslink/multicore_ipc/platform.c b/drivers/dsp/syslink/multicore_ipc/platform.c
index 73edf55c233..d71c3544dea 100644
--- a/drivers/dsp/syslink/multicore_ipc/platform.c
+++ b/drivers/dsp/syslink/multicore_ipc/platform.c
@@ -640,8 +640,7 @@ platform_get_config(struct platform_config *config)
 
 exit:
 	if (status < 0)
-		printk(KERN_ERR "platform_get_config failed! status = 0x%x\n",
-								status);
+		pr_err("platform_get_config failed! status = 0x%x\n", status);
 	return;
 }
 
@@ -704,7 +703,7 @@ platform_override_config(struct platform_config *config)
 
 exit:
 	if (status < 0)
-		printk(KERN_ERR "platform_override_config failed! status "
+		pr_err("platform_override_config failed! status "
 				"= 0x%x\n", status);
 	return status;
 }
@@ -728,10 +727,10 @@ platform_setup(void)
 	/* Initialize PlatformMem */
 	status = platform_mem_setup();
 	if (status < 0) {
-		printk(KERN_ERR "platform_setup : platform_mem_setup "
+		pr_err("platform_setup : platform_mem_setup "
 			"failed [0x%x]\n", status);
 	} else {
-		printk(KERN_ERR "platform_mem_setup : status [0x%x]\n" ,
+		pr_err("platform_mem_setup : status [0x%x]\n" ,
 			status);
 		platform_module->platform_mem_init_flag = true;
 	}
@@ -740,10 +739,10 @@ platform_setup(void)
 
 	status = multiproc_setup(&(config->multiproc_config));
 	if (status < 0) {
-		printk(KERN_ERR "platform_setup : multiproc_setup "
+		pr_err("platform_setup : multiproc_setup "
 			"failed [0x%x]\n", status);
 	} else {
-		printk(KERN_ERR "platform_setup : status [0x%x]\n", status);
+		pr_err("platform_setup : status [0x%x]\n", status);
 		platform_module->multiproc_init_flag = true;
 	}
 
@@ -751,11 +750,10 @@ platform_setup(void)
 	if (status >= 0) {
 		status = proc_mgr_setup(&(config->proc_mgr_config));
 		if (status < 0) {
-			printk(KERN_ERR "platform_setup : proc_mgr_setup "
+			pr_err("platform_setup : proc_mgr_setup "
 				"failed [0x%x]\n", status);
 		} else {
-			printk(KERN_ERR "proc_mgr_setup : status [0x%x]\n",
-				status);
+			pr_err("proc_mgr_setup : status [0x%x]\n", status);
 			platform_module->proc_mgr_init_flag = true;
 		}
 	}
@@ -764,11 +762,10 @@ platform_setup(void)
 	if (status >= 0) {
 		status = sharedregion_setup(&config->sharedregion_config);
 		if (status < 0) {
-			printk(KERN_ERR "platform_setup : sharedregion_setup "
+			pr_err("platform_setup : sharedregion_setup "
 				"failed [0x%x]\n", status);
 		} else {
-			printk(KERN_ERR "sharedregion_setup : status [0x%x]\n",
-				status);
+			pr_err("sharedregion_setup : status [0x%x]\n", status);
 			platform_module->sharedregion_init_flag = true;
 		}
 	}
@@ -778,11 +775,11 @@ platform_setup(void)
 		status = notify_ducatidrv_setup(&config->
 						notify_ducatidrv_config);
 		if (status < 0) {
-			printk(KERN_ERR "platform_setup : "
+			pr_err("platform_setup : "
 				"notify_ducatidrv_setup failed [0x%x]\n",
 				status);
 		} else {
-			printk(KERN_ERR "notify_ducatidrv_setup : "
+			pr_err("notify_ducatidrv_setup : "
 				"status [0x%x]\n", status);
 			platform_module->notify_ducatidrv_init_flag = true;
 		}
@@ -792,11 +789,10 @@ platform_setup(void)
 	if (status >= 0) {
 		status = notify_setup(&config->notify_config);
 		if (status < 0) {
-			printk(KERN_ERR "platform_setup : notify_setup "
+			pr_err("platform_setup : notify_setup "
 				"failed [0x%x]\n", status);
 		} else {
-			printk(KERN_ERR "notify_setup : status [0x%x]\n",
-				status);
+			pr_err("notify_setup : status [0x%x]\n", status);
 			platform_module->notify_init_flag = true;
 		}
 	}
@@ -805,11 +801,10 @@ platform_setup(void)
 	if (status >= 0) {
 		status = ipu_pm_setup(&config->ipu_pm_config);
 		if (status < 0) {
-			printk(KERN_ERR "platform_setup : ipu_pm_setup "
+			pr_err("platform_setup : ipu_pm_setup "
 				"failed [0x%x]\n", status);
 		} else {
-			printk(KERN_ERR "ipu_pm_setup : status [0x%x]\n",
-				status);
+			pr_err("ipu_pm_setup : status [0x%x]\n", status);
 			platform_module->ipu_pm_init_flag = true;
 		}
 	}
@@ -817,11 +812,10 @@ platform_setup(void)
 	if (status >= 0) {
 		status = nameserver_setup();
 		if (status < 0) {
-			printk(KERN_ERR "platform_setup : nameserver_setup "
+			pr_err("platform_setup : nameserver_setup "
 				"failed [0x%x]\n", status);
 		} else {
-			printk(KERN_ERR "nameserver_setup : status [0x%x]\n",
-				status);
+			pr_err("nameserver_setup : status [0x%x]\n", status);
 			platform_module->nameserver_init_flag = true;
 		}
 	}
@@ -830,11 +824,10 @@ platform_setup(void)
 	if (status >= 0) {
 		status = gatemp_setup(&config->gatemp_config);
 		if (status < 0) {
-			printk(KERN_ERR "platform_setup : gatemp_setup "
+			pr_err("platform_setup : gatemp_setup "
 				"failed [0x%x]\n", status);
 		} else {
-			printk(KERN_ERR "gatemp_setup : status [0x%x]\n",
-				status);
+			pr_err("gatemp_setup : status [0x%x]\n", status);
 			platform_module->gatemp_init_flag = true;
 		}
 	}
@@ -843,11 +836,10 @@ platform_setup(void)
 	if (status >= 0) {
 		status = gatepeterson_setup(&config->gatepeterson_config);
 		if (status < 0) {
-			printk(KERN_ERR "platform_setup : gatepeterson_setup "
+			pr_err("platform_setup : gatepeterson_setup "
 				"failed [0x%x]\n", status);
 		} else {
-			printk(KERN_ERR "gatepeterson_setup : status [0x%x]\n",
-				status);
+			pr_err("gatepeterson_setup : status [0x%x]\n", status);
 			platform_module->gatepeterson_init_flag = true;
 		}
 	}
@@ -859,7 +851,7 @@ platform_setup(void)
 		m_info.is_cached = false;
 		status = platform_mem_map(&m_info);
 		if (status < 0) {
-			printk(KERN_ERR "platform_setup : platform_mem_map "
+			pr_err("platform_setup : platform_mem_map "
 				"failed [0x%x]\n", status);
 		} else {
 			config->gatehwspinlock_config.num_locks = 32;
@@ -868,7 +860,7 @@ platform_setup(void)
 			status = gatehwspinlock_setup(&config->
 							gatehwspinlock_config);
 			if (status < 0) {
-				printk(KERN_ERR "platform_setup : "
+				pr_err("platform_setup : "
 					"gatehwspinlock_setup failed [0x%x]\n",
 					status);
 			} else
@@ -881,11 +873,10 @@ platform_setup(void)
 	if (status >= 0) {
 		status = messageq_setup(&config->messageq_config);
 		if (status < 0) {
-			printk(KERN_ERR "platform_setup : messageq_setup "
+			pr_err("platform_setup : messageq_setup "
 				"failed [0x%x]\n", status);
 		} else {
-			printk(KERN_ERR "messageq_setup : status [0x%x]\n",
-				status);
+			pr_err("messageq_setup : status [0x%x]\n", status);
 			platform_module->messageq_init_flag = true;
 		}
 	}
@@ -894,10 +885,10 @@ platform_setup(void)
 	if (status >= 0) {
 		status = ringio_setup(&config->ringio_config);
 		if (status < 0) {
-			printk(KERN_ERR "platform_setup : ringio_setup "
+			pr_err("platform_setup : ringio_setup "
 				"failed [0x%x]\n", status);
 		} else {
-			printk(KERN_ERR "ringio_setup : status [0x%x]\n",
+			pr_err("ringio_setup : status [0x%x]\n",
 				status);
 			platform_module->ringio_init_flag = true;
 		}
@@ -908,11 +899,11 @@ platform_setup(void)
 		status = ringiotransportshm_setup(&config->
 						ringiotransportshm_config);
 		if (status < 0) {
-			printk(KERN_ERR "platform_setup : "
+			pr_err("platform_setup : "
 				"ringiotransportshm_setup "
 				"failed [0x%x]\n", status);
 		} else {
-			printk(KERN_ERR "ringiotransportshm_setup : status "
+			pr_err("ringiotransportshm_setup : status "
 				"[0x%x]\n", status);
 			platform_module->ringiotransportshm_init_flag = true;
 		}
@@ -922,11 +913,10 @@ platform_setup(void)
 	if (status >= 0) {
 		status = heapbufmp_setup(&config->heapbufmp_config);
 		if (status < 0) {
-			printk(KERN_ERR "platform_setup : heapbufmp_setup "
+			pr_err("platform_setup : heapbufmp_setup "
 				"failed [0x%x]\n", status);
 		} else {
-			printk(KERN_ERR "heapbufmp_setup : status [0x%x]\n",
-				status);
+			pr_err("heapbufmp_setup : status [0x%x]\n", status);
 			platform_module->heapbufmp_init_flag = true;
 		}
 	}
@@ -935,11 +925,10 @@ platform_setup(void)
 	if (status >= 0) {
 		status = heapmemmp_setup(&config->heapmemmp_config);
 		if (status < 0) {
-			printk(KERN_ERR "platform_setup : heapmemmp_setup "
+			pr_err("platform_setup : heapmemmp_setup "
 				"failed [0x%x]\n", status);
 		} else {
-			printk(KERN_ERR "heapmemmp_setup : status [0x%x]\n",
-				status);
+			pr_err("heapmemmp_setup : status [0x%x]\n", status);
 			platform_module->heapmemmp_init_flag = true;
 		}
 	}
@@ -948,10 +937,10 @@ platform_setup(void)
 	if (status >= 0) {
 		status = heapmultibuf_setup(&config->heapmultibuf_config);
 		if (status < 0) {
-			printk(KERN_ERR "platform_setup : heapmultibuf_setup "
+			pr_err("platform_setup : heapmultibuf_setup "
 				"failed [0x%x]\n", status);
 		} else {
-			printk(KERN_ERR "heapmultibuf_setup : status [0x%x]\n",
+			pr_err("heapmultibuf_setup : status [0x%x]\n",
 				status);
 			platform_module->heapmultibuf_init_flag = true;
 		}
@@ -962,11 +951,11 @@ platform_setup(void)
 		status = listmp_setup(
 				&config->listmp_config);
 		if (status < 0) {
-			printk(KERN_ERR "platform_setup : "
+			pr_err("platform_setup : "
 				"listmp_setup failed [0x%x]\n",
 				status);
 		} else {
-			printk(KERN_ERR "listmp_setup : "
+			pr_err("listmp_setup : "
 				"status [0x%x]\n", status);
 			platform_module->listmp_init_flag = true;
 		}
@@ -977,12 +966,11 @@ platform_setup(void)
 		status = transportshm_setup(
 				 &config->transportshm_config);
 		if (status < 0) {
-			printk(KERN_ERR "platform_setup : "
+			pr_err("platform_setup : "
 				"transportshm_setup failed [0x%x]\n",
 				status);
 		} else {
-			printk(KERN_ERR "transportshm_setup : "
-				"status [0x%x]\n", status);
+			pr_err("transportshm_setup : status [0x%x]\n", status);
 			platform_module->transportshm_init_flag = true;
 		}
 	}
@@ -992,11 +980,11 @@ platform_setup(void)
 		status = nameserver_remotenotify_setup(
 				 &config->nameserver_remotenotify_config);
 		if (status < 0) {
-			printk(KERN_ERR "platform_setup : "
+			pr_err("platform_setup : "
 				"nameserver_remotenotify_setup failed "
 				"[0x%x]\n", status);
 		} else {
-			printk(KERN_ERR "nameserver_remotenotify_setup : "
+			pr_err("nameserver_remotenotify_setup : "
 				"status [0x%x]\n", status);
 			platform_module->nameserver_remotenotify_init_flag =
 									true;
@@ -1053,11 +1041,10 @@ platform_setup(void)
 	if (status >= 0) {
 		status = _platform_setup();
 		if (status < 0) {
-			printk(KERN_ERR "platform_setup : _platform_setup "
+			pr_err("platform_setup : _platform_setup "
 				"failed [0x%x]\n", status);
 		} else {
-			printk(KERN_ERR "_platform_setup : status [0x%x]\n",
-				status);
+			pr_err("_platform_setup : status [0x%x]\n", status);
 			platform_module->platform_init_flag = true;
 		}
 
@@ -1081,7 +1068,7 @@ platform_destroy(void)
 	if (platform_module->platform_init_flag == true) {
 		status = _platform_destroy();
 		if (status < 0) {
-			printk(KERN_ERR "platform_destroy : _platform_destroy "
+			pr_err("platform_destroy : _platform_destroy "
 				"failed [0x%x]\n", status);
 		} else {
 			platform_module->platform_init_flag = false;
@@ -1131,7 +1118,7 @@ platform_destroy(void)
 	if (platform_module->nameserver_remotenotify_init_flag == true) {
 		status = nameserver_remotenotify_destroy();
 		if (status < 0) {
-			printk(KERN_ERR "platform_destroy : "
+			pr_err("platform_destroy : "
 				"nameserver_remotenotify_destroy "
 				"failed [0x%x]\n", status);
 		} else {
@@ -1144,7 +1131,7 @@ platform_destroy(void)
 	if (platform_module->transportshm_init_flag == true) {
 		status = transportshm_destroy();
 		if (status < 0) {
-			printk(KERN_ERR "platform_destroy : "
+			pr_err("platform_destroy : "
 				"transportshm_destroy failed "
 				"[0x%x]\n", status);
 		} else {
@@ -1157,7 +1144,7 @@ platform_destroy(void)
 	if (platform_module->listmp_init_flag == true) {
 		status = listmp_destroy();
 		if (status < 0) {
-			printk(KERN_ERR "platform_destroy : "
+			pr_err("platform_destroy : "
 				"listmp_destroy failed [0x%x]\n",
 				status);
 		} else {
@@ -1170,7 +1157,7 @@ platform_destroy(void)
 	if (platform_module->heapmultibuf_init_flag == true) {
 		status = heapmultibuf_destroy();
 		if (status < 0) {
-			printk(KERN_ERR "platform_destroy : "
+			pr_err("platform_destroy : "
 				"heapmultibuf_destroy "
 				"failed [0x%x]\n", status);
 		} else {
@@ -1182,7 +1169,7 @@ platform_destroy(void)
 	if (platform_module->heapbufmp_init_flag == true) {
 		status = heapbufmp_destroy();
 		if (status < 0) {
-			printk(KERN_ERR "platform_destroy : heapbufmp_destroy "
+			pr_err("platform_destroy : heapbufmp_destroy "
 				"failed [0x%x]\n", status);
 		} else {
 			platform_module->heapbufmp_init_flag = false;
@@ -1193,7 +1180,7 @@ platform_destroy(void)
 	if (platform_module->heapmemmp_init_flag == true) {
 		status = heapmemmp_destroy();
 		if (status < 0) {
-			printk(KERN_ERR "platform_destroy : heapmemmp_destroy "
+			pr_err("platform_destroy : heapmemmp_destroy "
 				"failed [0x%x]\n", status);
 		} else {
 			platform_module->heapmemmp_init_flag = false;
@@ -1204,7 +1191,7 @@ platform_destroy(void)
 	if (platform_module->messageq_init_flag == true) {
 		status = messageq_destroy();
 		if (status < 0) {
-			printk(KERN_ERR "platform_destroy : messageq_destroy "
+			pr_err("platform_destroy : messageq_destroy "
 				"failed [0x%x]\n", status);
 		} else {
 			platform_module->messageq_init_flag = false;
@@ -1215,7 +1202,7 @@ platform_destroy(void)
 	if (platform_module->ringio_init_flag == true) {
 		status = ringio_destroy();
 		if (status < 0) {
-			printk(KERN_ERR "platform_destroy : ringio_destroy "
+			pr_err("platform_destroy : ringio_destroy "
 				"failed [0x%x]\n", status);
 		} else {
 			platform_module->ringio_init_flag = false;
@@ -1227,7 +1214,7 @@ platform_destroy(void)
 	if (platform_module->ringiotransportshm_init_flag == true) {
 		status = ringiotransportshm_destroy();
 		if (status < 0) {
-			printk(KERN_ERR "platform_destroy : "
+			pr_err("platform_destroy : "
 					"ringiotransportshm_destroy "
 					"failed [0x%x]\n", status);
 		} else {
@@ -1239,7 +1226,7 @@ platform_destroy(void)
 	if (platform_module->gatepeterson_init_flag == true) {
 		status = gatepeterson_destroy();
 		if (status < 0) {
-			printk(KERN_ERR "platform_destroy : "
+			pr_err("platform_destroy : "
 				"gatepeterson_destroy failed [0x%x]\n", status);
 		} else {
 			platform_module->gatepeterson_init_flag = false;
@@ -1250,7 +1237,7 @@ platform_destroy(void)
 	if (platform_module->gatehwspinlock_init_flag == true) {
 		status = gatehwspinlock_destroy();
 		if (status < 0) {
-			printk(KERN_ERR "platform_destroy : "
+			pr_err("platform_destroy : "
 				"gatehwspinlock_destroy failed "
 				"[0x%x]\n", status);
 		} else {
@@ -1262,7 +1249,7 @@ platform_destroy(void)
 		u_info.is_cached = false;
 		status = platform_mem_unmap(&u_info);
 		if (status < 0)
-			printk(KERN_ERR "platform_destroy : platform_mem_unmap"
+			pr_err("platform_destroy : platform_mem_unmap"
 						" failed [0x%x]\n", status);
 	}
 
@@ -1270,7 +1257,7 @@ platform_destroy(void)
 	if (platform_module->gatemp_init_flag == true) {
 		status = gatemp_destroy();
 		if (status < 0) {
-			printk(KERN_ERR "platform_destroy : "
+			pr_err("platform_destroy : "
 				"gatemp_destroy failed [0x%x]\n", status);
 		} else {
 			platform_module->gatemp_init_flag = false;
@@ -1281,7 +1268,7 @@ platform_destroy(void)
 	if (platform_module->nameserver_init_flag == true) {
 		status = nameserver_destroy();
 		if (status < 0) {
-			printk(KERN_ERR "platform_destroy : nameserver_destroy "
+			pr_err("platform_destroy : nameserver_destroy "
 				"failed [0x%x]\n", status);
 		} else {
 			platform_module->nameserver_init_flag = false;
@@ -1291,7 +1278,7 @@ platform_destroy(void)
 	if (platform_module->ipu_pm_init_flag == true) {
 		status = ipu_pm_destroy();
 		if (status < 0) {
-			printk(KERN_ERR "platform_destroy : ipu_pm_destroy "
+			pr_err("platform_destroy : ipu_pm_destroy "
 				"failed [0x%x]\n", status);
 		} else {
 			platform_module->ipu_pm_init_flag = false;
@@ -1302,7 +1289,7 @@ platform_destroy(void)
 	if (platform_module->notify_ducatidrv_init_flag == true) {
 		status = notify_ducatidrv_destroy();
 		if (status < 0) {
-			printk(KERN_ERR "platform_destroy : "
+			pr_err("platform_destroy : "
 				"notify_ducatidrv_destroy failed [0x%x]\n",
 				status);
 		} else {
@@ -1314,7 +1301,7 @@ platform_destroy(void)
 	if (platform_module->notify_init_flag == true) {
 		status = notify_destroy();
 		if (status < 0) {
-			printk(KERN_ERR "platform_destroy : notify_destroy "
+			pr_err("platform_destroy : notify_destroy "
 				"failed [0x%x]\n", status);
 		} else {
 			platform_module->notify_init_flag = false;
@@ -1325,7 +1312,7 @@ platform_destroy(void)
 	if (platform_module->sharedregion_init_flag == true) {
 		status = sharedregion_destroy();
 		if (status < 0) {
-			printk(KERN_ERR "platform_destroy : "
+			pr_err("platform_destroy : "
 				"sharedregion_destroy failed [0x%x]\n", status);
 		} else {
 			platform_module->sharedregion_init_flag = false;
@@ -1336,7 +1323,7 @@ platform_destroy(void)
 	if (platform_module->proc_mgr_init_flag == true) {
 		status = proc_mgr_destroy();
 		if (status < 0) {
-			printk(KERN_ERR "platform_destroy : proc_mgr_destroy "
+			pr_err("platform_destroy : proc_mgr_destroy "
 				"failed [0x%x]\n", status);
 		} else {
 			platform_module->proc_mgr_init_flag = false;
@@ -1347,7 +1334,7 @@ platform_destroy(void)
 	if (platform_module->multiproc_init_flag == true) {
 		status = multiproc_destroy();
 		if (status < 0) {
-			printk(KERN_ERR "platform_destroy : multiproc_destroy "
+			pr_err("platform_destroy : multiproc_destroy "
 				"failed [0x%x]\n", status);
 		} else {
 			platform_module->multiproc_init_flag = false;
@@ -1358,7 +1345,7 @@ platform_destroy(void)
 	if (platform_module->platform_mem_init_flag == true) {
 		status = platform_mem_destroy();
 		if (status < 0) {
-			printk(KERN_ERR "platform_destroy : "
+			pr_err("platform_destroy : "
 				"platform_mem_destroy failed [0x%x]\n", status);
 		} else {
 			platform_module->platform_mem_init_flag = false;
@@ -1400,7 +1387,7 @@ static s32 _platform_setup(void)
 	/* Get MultiProc ID by name. */
 	proc_id = multiproc_get_id("SysM3");
 	if (proc_id >= MULTIPROC_MAXPROCESSORS) {
-		printk(KERN_ERR "multi proc returned invalid proc id\n");
+		pr_err("multi proc returned invalid proc id\n");
 		goto multiproc_id_fail;
 	}
 	handle = &platform_objects[proc_id];
@@ -1438,7 +1425,7 @@ static s32 _platform_setup(void)
 	/* Get MultiProc ID by name. */
 	proc_id = multiproc_get_id("AppM3");
 	if (proc_id >= MULTIPROC_MAXPROCESSORS) {
-		printk(KERN_ERR "multi proc returned invalid proc id\n");
+		pr_err("multi proc returned invalid proc id\n");
 		goto proc_mgr_create_fail;
 	}
 	handle = &platform_objects[proc_id];
@@ -1470,7 +1457,7 @@ static s32 _platform_setup(void)
 	/* Get MultiProc ID by name. */
 	proc_id = multiproc_get_id("Tesla");
 	if (proc_id >= MULTIPROC_MAXPROCESSORS) {
-		printk(KERN_ERR "multi proc returned invalid proc id\n");
+		pr_err("multi proc returned invalid proc id\n");
 		goto multiproc_id_fail;
 	}
 	handle = &platform_objects[proc_id];
@@ -1717,7 +1704,7 @@ alloced_host_sr_config_exit:
 	kfree(platform_host_sr_config);
 exit:
 	if (status < 0)
-		printk(KERN_ERR "platform_load_callback failed, status [0x%x]\n",
+		pr_err("platform_load_callback failed, status [0x%x]\n",
 			status);
 
 	return status;
@@ -1741,7 +1728,7 @@ int platform_start_callback(u16 proc_id, void *arg)
 	} while (status < 0);
 
 	if (status < 0)
-		printk(KERN_ERR "platform_load_callback failed, status [0x%x]\n",
+		pr_err("platform_load_callback failed, status [0x%x]\n",
 			status);
 
 	return status;
@@ -1849,12 +1836,12 @@ _platform_read_slave_memory(u16 proc_id,
 	if (status >= 0) {
 		memcpy(value, (void *) m_addr, *num_bytes);
 		done = true;
-		printk(KERN_ERR "_platform_read_slave_memory successful! "
+		pr_err("_platform_read_slave_memory successful! "
 			"status = 0x%x, proc_id = %d, addr = 0x%x, "
 			"m_addr = 0x%x, size = 0x%x", status, proc_id, addr,
 			m_addr, *num_bytes);
 	} else {
-		printk(KERN_ERR "_platform_read_slave_memory failed! "
+		pr_err("_platform_read_slave_memory failed! "
 			"status = 0x%x, proc_id = %d, addr = 0x%x, "
 			"m_addr = 0x%x, size = 0x%x", status, proc_id, addr,
 			m_addr, *num_bytes);
@@ -1912,12 +1899,12 @@ static int _platform_write_slave_memory(u16 proc_id, u32 addr, void *value,
 	if (status >= 0) {
 		memcpy((void *) m_addr, value, *num_bytes);
 		done = true;
-		printk(KERN_ERR "_platform_write_slave_memory successful! "
+		pr_err("_platform_write_slave_memory successful! "
 			"status = 0x%x, proc_id = %d, addr = 0x%x, "
 			"m_addr = 0x%x, size = 0x%x", status, proc_id, addr,
 			m_addr, *num_bytes);
 	} else {
-		printk(KERN_ERR "_platform_write_slave_memory failed! "
+		pr_err("_platform_write_slave_memory failed! "
 			"status = 0x%x, proc_id = %d, addr = 0x%x, "
 			"m_addr = 0x%x, size = 0x%x", status, proc_id, addr,
 			m_addr, *num_bytes);
diff --git a/drivers/dsp/syslink/multicore_ipc/sharedregion.c b/drivers/dsp/syslink/multicore_ipc/sharedregion.c
index 61408ad603e..7095f142d97 100644
--- a/drivers/dsp/syslink/multicore_ipc/sharedregion.c
+++ b/drivers/dsp/syslink/multicore_ipc/sharedregion.c
@@ -163,7 +163,7 @@ gate_create_fail:
 	kfree(sharedregion_module->regions);
 
 error:
-	printk(KERN_ERR "sharedregion_setup failed status:%x\n", retval);
+	pr_err("sharedregion_setup failed status:%x\n", retval);
 	sharedregion_destroy();
 	return retval;
 }
@@ -203,7 +203,7 @@ int sharedregion_destroy(void)
 
 error:
 	if (retval < 0) {
-		printk(KERN_ERR "sharedregion_destroy failed status:%x\n",
+		pr_err("sharedregion_destroy failed status:%x\n",
 			retval);
 	}
 	return retval;
@@ -271,10 +271,8 @@ int sharedregion_start(void)
 	}
 
 error:
-	if (retval < 0) {
-		printk(KERN_ERR "sharedregion_start failed status:%x\n",
-			retval);
-	}
+	if (retval < 0)
+		pr_err("sharedregion_start failed status:%x\n", retval);
 	return retval;
 }
 EXPORT_SYMBOL(sharedregion_start);
@@ -325,7 +323,7 @@ int sharedregion_stop(void)
 
 error:
 	if (retval < 0)
-		printk(KERN_ERR "sharedregion_stop failed status:%x\n", retval);
+		pr_err("sharedregion_stop failed status:%x\n", retval);
 	return retval;
 }
 EXPORT_SYMBOL(sharedregion_stop);
@@ -375,10 +373,8 @@ int sharedregion_attach(u16 remote_proc_id)
 	}
 
 error:
-	if (retval < 0) {
-		printk(KERN_ERR "sharedregion_attach failed status:%x\n",
-			retval);
-	}
+	if (retval < 0)
+		pr_err("sharedregion_attach failed status:%x\n", retval);
 	return retval;
 }
 EXPORT_SYMBOL(sharedregion_attach);
@@ -417,17 +413,15 @@ int sharedregion_detach(u16 remote_proc_id)
 			tmp_status = heapmemmp_close((void **) &(region->heap));
 			if ((tmp_status < 0) && (retval >= 0)) {
 				retval = -1;
-				printk(KERN_ERR "sharedregion_detach: "
+				pr_err("sharedregion_detach: "
 					"heapmemmp_close failed!");
 			}
 		}
 	}
 
 error:
-	if (retval < 0) {
-		printk(KERN_ERR "sharedregion_detach failed status:%x\n",
-			retval);
-	}
+	if (retval < 0)
+		pr_err("sharedregion_detach failed status:%x\n", retval);
 	return retval;
 }
 EXPORT_SYMBOL(sharedregion_detach);
@@ -469,7 +463,7 @@ void *sharedregion_get_ptr(u32 *srptr)
 	return return_ptr;
 
 error:
-	printk(KERN_ERR "sharedregion_get_ptr failed 0x%x\n", retval);
+	pr_err("sharedregion_get_ptr failed 0x%x\n", retval);
 	return (void *)NULL;
 
 }
@@ -522,7 +516,7 @@ u32 *sharedregion_get_srptr(void *addr, u16 id)
 	return ret_ptr;
 
 error:
-	printk(KERN_ERR	"sharedregion_get_srptr failed 0x%x\n", retval);
+	pr_err("sharedregion_get_srptr failed 0x%x\n", retval);
 	return (u32 *)NULL;
 }
 EXPORT_SYMBOL(sharedregion_get_srptr);
@@ -625,13 +619,13 @@ success:
 
 dup_entry_error: /* Fall through */
 mem_overlap_error:
-	printk(KERN_WARNING "sharedregion_add entry exists status: %x\n",
+	pr_warn("sharedregion_add entry exists status: %x\n",
 		retval);
 	mutex_unlock(sharedregion_module->local_lock);
 
 error:
 	if (retval < 0)
-		printk(KERN_ERR "sharedregion_add failed status:%x\n", retval);
+		pr_err("sharedregion_add failed status:%x\n", retval);
 	return retval;
 }
 EXPORT_SYMBOL(sharedregion_add);
@@ -686,7 +680,7 @@ int sharedregion_remove(u32 index)
 	return 0;
 
 error:
-	printk(KERN_ERR "sharedregion_remove failed status:%x\n", retval);
+	pr_err("sharedregion_remove failed status:%x\n", retval);
 	return retval;
 }
 EXPORT_SYMBOL(sharedregion_remove);
@@ -733,8 +727,7 @@ int sharedregion_get_table_info(u32 index, u16 proc_id,
 	return 0;
 
 error:
-	printk(KERN_ERR "sharedregion_get_table_info failed status:%x\n",
-		retval);
+	pr_err("sharedregion_get_table_info failed status:%x\n", retval);
 	return retval;
 }
 EXPORT_SYMBOL(sharedregion_get_table_info);
@@ -781,8 +774,7 @@ int sharedregion_set_table_info(u32 index, u16 proc_id,
 	return 0;
 
 error:
-	printk(KERN_ERR "sharedregion_set_table_info failed status:%x\n",
-		retval);
+	pr_err("sharedregion_set_table_info failed status:%x\n", retval);
 	return retval;
 }
 EXPORT_SYMBOL(sharedregion_set_table_info);
@@ -817,7 +809,7 @@ void sharedregion_get_region_info(u16 id, struct sharedregion_region *region)
 
 error:
 	if (retval < 0) {
-		printk(KERN_ERR "sharedregion_get_region_info failed: "
+		pr_err("sharedregion_get_region_info failed: "
 			"status = 0x%x", retval);
 	}
 	return;
@@ -868,20 +860,20 @@ int sharedregion_set_entry(u16 id, struct sharedregion_entry *entry)
 	retval = _sharedregion_check_overlap(region->entry.base,
 						region->entry.len);
 	if (retval < 0) {
-		printk(KERN_ERR "sharedregion_set_entry: Entry is overlapping "
+		pr_err("sharedregion_set_entry: Entry is overlapping "
 			"existing entry!");
 		goto error;
 	}
 	if (region->entry.is_valid) {
 		/*region entry should be invalid at this point */
 		retval = -EEXIST;
-		printk(KERN_ERR "_sharedregion_setEntry: Entry already exists");
+		pr_err("_sharedregion_setEntry: Entry already exists");
 		goto error;
 	}
 	if ((entry->cache_enable) && (entry->cache_line_size == 0)) {
 		/* if cache enabled, cache line size must != 0 */
 		retval = -1;
-		printk(KERN_ERR "_sharedregion_setEntry: If cache enabled, "
+		pr_err("_sharedregion_setEntry: If cache enabled, "
 			"cache line size must != 0");
 		goto error;
 	}
@@ -945,7 +937,7 @@ int sharedregion_set_entry(u16 id, struct sharedregion_entry *entry)
 	return 0;
 
 error:
-	printk(KERN_ERR "sharedregion_set_entry failed! status = 0x%x", retval);
+	pr_err("sharedregion_set_entry failed! status = 0x%x", retval);
 	return retval;
 }
 
@@ -1021,8 +1013,7 @@ int sharedregion_clear_entry(u16 id)
 	return 0;
 
 error:
-	printk(KERN_ERR "sharedregion_clear_entry failed! status = 0x%x",
-		retval);
+	pr_err("sharedregion_clear_entry failed! status = 0x%x", retval);
 	return retval;
 }
 
@@ -1083,10 +1074,8 @@ void sharedregion_entry_init(struct sharedregion_entry *entry)
 	entry->is_valid = false;
 
 error:
-	if (retval < 0) {
-		printk(KERN_ERR "sharedregion_entry_init failed: "
-			"status = 0x%x", retval);
-	}
+	if (retval < 0)
+		pr_err("sharedregion_entry_init failed: status = 0x%x", retval);
 	return;
 }
 
@@ -1124,7 +1113,7 @@ void *sharedregion_get_heap(u16 id)
 	return (void *)heap;
 
 error:
-	printk(KERN_ERR "sharedregion_get_heap failed: status = 0x%x", retval);
+	pr_err("sharedregion_get_heap failed: status = 0x%x", retval);
 	return (void *)NULL;
 }
 
@@ -1166,10 +1155,8 @@ u16 sharedregion_get_id(void *addr)
 	mutex_unlock(sharedregion_module->local_lock);
 
 error:
-	if (retval < 0) {
-		printk(KERN_ERR "sharedregion_get_id failed: "
-			"status = 0x%x", retval);
-	}
+	if (retval < 0)
+		pr_err("sharedregion_get_id failed: status = 0x%x", retval);
 	return region_id;
 }
 EXPORT_SYMBOL(sharedregion_get_id);
@@ -1213,7 +1200,7 @@ u16 sharedregion_get_id_by_name(char *name)
 
 error:
 	if (retval < 0) {
-		printk(KERN_ERR "sharedregion_get_id_by_name failed: "
+		pr_err("sharedregion_get_id_by_name failed: "
 			"status = 0x%x", retval);
 	}
 	return region_id;
@@ -1248,7 +1235,7 @@ int sharedregion_get_entry(u16 id, struct sharedregion_entry *entry)
 	return 0;
 
 error:
-	printk(KERN_ERR "sharedregion_get_entry failed: status = 0x%x", retval);
+	pr_err("sharedregion_get_entry failed: status = 0x%x", retval);
 	return retval;
 }
 
@@ -1287,7 +1274,7 @@ uint sharedregion_get_cache_line_size(u16 id)
 	return cache_line_size;
 
 error:
-	printk(KERN_ERR "sharedregion_get_cache_line_size failed: "
+	pr_err("sharedregion_get_cache_line_size failed: "
 		"status = 0x%x", retval);
 	return cache_line_size;
 }
@@ -1327,7 +1314,7 @@ bool sharedregion_is_cache_enabled(u16 id)
 	return cache_enable;
 
 error:
-	printk(KERN_ERR "sharedregion_is_cache_enabled failed: "
+	pr_err("sharedregion_is_cache_enabled failed: "
 		"status = 0x%x", retval);
 	return false;
 }
@@ -1379,7 +1366,7 @@ void *sharedregion_reserve_memory(u16 id, uint size)
 	/* Need to make sure (cur_size + new_size) is smaller than region len */
 	if (region->entry.len < (cur_size + new_size)) {
 		retval = -EINVAL;
-		printk(KERN_ERR "sharedregion_reserve_memory: Too large size "
+		pr_err("sharedregion_reserve_memory: Too large size "
 					"is requested to be reserved!");
 		goto error;
 	}
@@ -1389,8 +1376,7 @@ void *sharedregion_reserve_memory(u16 id, uint size)
 	return ret_ptr;
 
 error:
-	printk(KERN_ERR "sharedregion_reserve_memory failed: "
-		"status = 0x%x", retval);
+	pr_err("sharedregion_reserve_memory failed: status = 0x%x", retval);
 	return (void *)NULL;
 }
 
@@ -1439,7 +1425,7 @@ void sharedregion_unreserve_memory(u16 id, uint size)
 
 error:
 	if (retval < 0) {
-		printk(KERN_ERR "sharedregion_unreserve_memory failed: "
+		pr_err("sharedregion_unreserve_memory failed: "
 			"status = 0x%x", retval);
 	}
 	return;
@@ -1475,7 +1461,7 @@ static int _sharedregion_check_overlap(void *base, u32 len)
 				if (base < (void *)((u32) region->entry.base
 							+ region->entry.len)) {
 					retval = -1;
-					printk(KERN_ERR "_sharedregion_check_"
+					pr_err("_sharedregion_check_"
 						"_overlap failed: Specified "
 						"region falls within another "
 						"region!");
@@ -1485,7 +1471,7 @@ static int _sharedregion_check_overlap(void *base, u32 len)
 				if ((void *)((u32) base + len) > \
 					region->entry.base) {
 					retval = -1;
-					printk(KERN_ERR "_sharedregion_check_"
+					pr_err("_sharedregion_check_"
 						"_overlap failed: Specified "
 						"region spans across multiple "
 						"regions!");
@@ -1499,8 +1485,7 @@ static int _sharedregion_check_overlap(void *base, u32 len)
 	return 0;
 
 error:
-	printk(KERN_ERR "_sharedregion_check_overlap failed: "
-		"status = 0x%x", retval);
+	pr_err("_sharedregion_check_overlap failed: status = 0x%x", retval);
 	return retval;
 }
 
@@ -1534,7 +1519,7 @@ static u32 _sharedregion_get_num_offset_bits(void)
 
 error:
 	if (retval < 0) {
-		printk(KERN_ERR "_sharedregion_get_num_offset_bits failed: "
+		pr_err("_sharedregion_get_num_offset_bits failed: "
 			"status = 0x%x", retval);
 	}
 	return num_offset_bits;
@@ -1569,21 +1554,21 @@ int _sharedregion_set_entry(u16 id, struct sharedregion_entry *entry)
 	retval = _sharedregion_check_overlap(region->entry.base,
 						region->entry.len);
 	if (retval < 0) {
-		printk(KERN_ERR "_sharedregion_set_entry: Entry is overlapping "
+		pr_err("_sharedregion_set_entry: Entry is overlapping "
 			"existing entry!");
 		goto error;
 	}
 	if (region->entry.is_valid) {
 		/*region entry should be invalid at this point */
 		retval = -EEXIST;
-		printk(KERN_ERR "_sharedregion_set_entry: ntry already exists");
+		pr_err("_sharedregion_set_entry: ntry already exists");
 		goto error;
 	}
 	/* Fail if cacheEnabled and cache_line_size equal 0 */
 	if ((entry->cache_enable) && (entry->cache_line_size == 0)) {
 		/* if cache enabled, cache line size must != 0 */
 		retval = -1;
-		printk(KERN_ERR "_sharedregion_set_entry: If cache enabled, "
+		pr_err("_sharedregion_set_entry: If cache enabled, "
 			"cache line size must != 0");
 		goto error;
 	}
@@ -1599,7 +1584,6 @@ int _sharedregion_set_entry(u16 id, struct sharedregion_entry *entry)
 	return 0;
 
 error:
-	printk(KERN_ERR "_sharedregion_set_entry failed! status = 0x%x",
-		retval);
+	pr_err("_sharedregion_set_entry failed! status = 0x%x", retval);
 	return retval;
 }
diff --git a/drivers/dsp/syslink/multicore_ipc/sharedregion_ioctl.c b/drivers/dsp/syslink/multicore_ipc/sharedregion_ioctl.c
index 75effd1197d..87d3cef4ac7 100644
--- a/drivers/dsp/syslink/multicore_ipc/sharedregion_ioctl.c
+++ b/drivers/dsp/syslink/multicore_ipc/sharedregion_ioctl.c
@@ -122,7 +122,7 @@ static int sharedregion_ioctl_setup(struct sharedregion_cmd_args *cargs)
 					region.entry.base,
 					PLATFORM_MEM_XLT_FLAGS_VIRT2PHYS);
 			if (region.entry.base == NULL) {
-				printk(KERN_ERR "sharedregion_ioctl_setup: "
+				pr_err("sharedregion_ioctl_setup: "
 					"failed to translate region virtual "
 					"address.\n");
 				status = -ENOMEM;
@@ -192,7 +192,7 @@ static int sharedregion_ioctl_get_heap(struct sharedregion_cmd_args *cargs)
 	if (heap_handle != NULL)
 		cargs->api_status = 0;
 	else {
-		printk(KERN_ERR "sharedregion_ioctl_get_heap failed: "
+		pr_err("sharedregion_ioctl_get_heap failed: "
 			"heap_handle is NULL!");
 		cargs->api_status = -1;
 	}
@@ -223,7 +223,7 @@ static int sharedregion_ioctl_set_entry(struct sharedregion_cmd_args *cargs)
 			(void *)cargs->args.set_entry.entry.base,
 			PLATFORM_MEM_XLT_FLAGS_PHYS2VIRT);
 	if (entry.base == NULL) {
-		printk(KERN_ERR "sharedregion_ioctl_set_entry: failed to"
+		pr_err("sharedregion_ioctl_set_entry: failed to"
 			"translate region virtual address.\n");
 		status = -ENOMEM;
 		goto exit;
@@ -280,7 +280,7 @@ static int sharedregion_ioctl_get_region_info(
 					region.entry.base,
 					PLATFORM_MEM_XLT_FLAGS_VIRT2PHYS);
 			if (region.entry.base == NULL) {
-				printk(KERN_ERR
+				pr_err(
 					"sharedregion_ioctl_get_region_info: "
 					"failed to translate region virtual "
 					"address.\n");
@@ -555,9 +555,7 @@ int sharedregion_ioctl(struct inode *inode, struct file *filp,
 	}
 
 exit:
-	if (status < 0) {
-		printk(KERN_ERR "sharedregion_ioctl failed! status = 0x%x",
-			status);
-	}
+	if (status < 0)
+		pr_err("sharedregion_ioctl failed! status = 0x%x", status);
 	return status;
 }
diff --git a/drivers/dsp/syslink/multicore_ipc/sysmemmgr.c b/drivers/dsp/syslink/multicore_ipc/sysmemmgr.c
index 42c64e3d897..ef09bdfc4e7 100644
--- a/drivers/dsp/syslink/multicore_ipc/sysmemmgr.c
+++ b/drivers/dsp/syslink/multicore_ipc/sysmemmgr.c
@@ -123,7 +123,7 @@ void sysmemmgr_get_config(struct sysmemmgr_config *config)
 	return;
 
 err_exit:
-	printk(KERN_ERR "sysmemmgr_get_config: Argument of type "
+	pr_err("sysmemmgr_get_config: Argument of type "
 		"(struct sysmemmgr_config *) passed is NULL\n");
 	return;
 }
@@ -195,21 +195,21 @@ int sysmemmgr_setup(struct sysmemmgr_config *config)
 	return 0;
 
 err_mem_gate:
-	printk(KERN_ERR "sysmemmgr_setup: Failed to create gate handle\n");
+	pr_err("sysmemmgr_setup: Failed to create gate handle\n");
 	goto exit;
 
 err_phys_addr:
-	printk(KERN_ERR "sysmemmgr_setup: Physical Base address of static "
+	pr_err("sysmemmgr_setup: Physical Base address of static "
 		"memory region is NULL\n");
 	goto exit;
 
 err_virt_addr:
-	printk(KERN_ERR "sysmemmgr_setup: Virtual Base address of static "
+	pr_err("sysmemmgr_setup: Virtual Base address of static "
 		"memory region is NULL\n");
 	goto exit;
 
 err_config:
-	printk(KERN_ERR "sysmemmgr_setup: Argument of type "
+	pr_err("sysmemmgr_setup: Argument of type "
 		"(struct sysmemmgr_config *) passed is NULL\n");
 	goto exit;
 
@@ -248,7 +248,7 @@ int sysmemmgr_destroy(void)
 	return 0;
 
 err_exit:
-	printk(KERN_ERR "sysmemgr_destroy: Module was not initialized\n");
+	pr_err("sysmemgr_destroy: Module was not initialized\n");
 	return status;
 }
 
@@ -337,10 +337,10 @@ void *sysmemmgr_alloc(u32 size, enum sysmemmgr_allocflag flag)
 	}
 
 err_exit:
-	printk(KERN_ERR "sysmemgr_alloc: Module was not initialized\n");
+	pr_err("sysmemgr_alloc: Module was not initialized\n");
 exit:
 	if (WARN_ON(ret_ptr == NULL))
-		printk(KERN_ERR "sysmemmgr_alloc: Allocation failed\n");
+		pr_err("sysmemmgr_alloc: Allocation failed\n");
 	return ret_ptr;
 }
 
@@ -398,7 +398,7 @@ int sysmemmgr_free(void *blk, u32 size, enum sysmemmgr_allocflag flag)
 	return 0;
 
 err_exit:
-	printk(KERN_ERR "sysmemgr_free: Module was not initialized\n");
+	pr_err("sysmemgr_free: Module was not initialized\n");
 	return status;
 }
 
@@ -449,8 +449,7 @@ void *sysmemmgr_translate(void *src_addr, enum sysmemmgr_xltflag flags)
 
 	default:
 	{
-		printk(KERN_ALERT "sysmemmgr_translate: Unhandled translation "
-			"flag\n");
+		pr_err("sysmemmgr_translate: Unhandled translation flag\n");
 	}
 	break;
 	}
diff --git a/drivers/dsp/syslink/multicore_ipc/sysmgr.c b/drivers/dsp/syslink/multicore_ipc/sysmgr.c
index bbf9b4be4b2..13bcce110ba 100644
--- a/drivers/dsp/syslink/multicore_ipc/sysmgr.c
+++ b/drivers/dsp/syslink/multicore_ipc/sysmgr.c
@@ -197,7 +197,7 @@ void sysmgr_get_config(struct sysmgr_config *config)
 
 	if (WARN_ON(config == NULL)) {
 		status = -EINVAL;
-		printk(KERN_ALERT "sysmgr_get_config [0x%x] : Argument of type"
+		pr_err("sysmgr_get_config [0x%x] : Argument of type"
 				" (sysmgr_get_config *) passed is null!",
 				status);
 		return;
@@ -384,10 +384,10 @@ s32 sysmgr_setup(const struct sysmgr_config *cfg)
 	/* Initialize PlatformMem */
 	status = platform_mem_setup();
 	if (status < 0) {
-		printk(KERN_ERR "sysmgr_setup : platform_mem_setup "
+		pr_err("sysmgr_setup : platform_mem_setup "
 			"failed [0x%x]\n", status);
 	} else {
-		printk(KERN_ERR "platform_mem_setup : status [0x%x]\n" ,
+		pr_err("platform_mem_setup : status [0x%x]\n" ,
 			status);
 		sysmgr_state.platform_mem_init_flag = true;
 	}
@@ -397,10 +397,10 @@ s32 sysmgr_setup(const struct sysmgr_config *cfg)
 
 	status = multiproc_setup(&(config->multiproc_cfg));
 	if (status < 0) {
-		printk(KERN_ERR "sysmgr_setup : multiproc_setup "
+		pr_err("sysmgr_setup : multiproc_setup "
 			"failed [0x%x]\n", status);
 	} else {
-		printk(KERN_ERR "sysmgr_setup : status [0x%x]\n" , status);
+		pr_err("sysmgr_setup : status [0x%x]\n" , status);
 		sysmgr_state.multiproc_init_flag = true;
 	}
 
@@ -408,10 +408,10 @@ s32 sysmgr_setup(const struct sysmgr_config *cfg)
 	if (status >= 0) {
 		status = proc_mgr_setup(&(config->proc_mgr_cfg));
 		if (status < 0) {
-			printk(KERN_ERR "sysmgr_setup : proc_mgr_setup "
+			pr_err("sysmgr_setup : proc_mgr_setup "
 				"failed [0x%x]\n", status);
 		} else {
-			printk(KERN_ERR "proc_mgr_setup : status [0x%x]\n" ,
+			pr_err("proc_mgr_setup : status [0x%x]\n" ,
 				status);
 			sysmgr_state.proc_mgr_init_flag = true;
 		}
@@ -421,10 +421,10 @@ s32 sysmgr_setup(const struct sysmgr_config *cfg)
 	if (status >= 0) {
 		status = sharedregion_setup(&config->sharedregion_cfg);
 		if (status < 0) {
-			printk(KERN_ERR "sysmgr_setup : sharedregion_setup "
+			pr_err("sysmgr_setup : sharedregion_setup "
 				"failed [0x%x]\n", status);
 		} else {
-			printk(KERN_ERR "sharedregion_setup : status [0x%x]\n" ,
+			pr_err("sharedregion_setup : status [0x%x]\n" ,
 				status);
 			sysmgr_state.sharedregion_init_flag = true;
 		}
@@ -434,10 +434,10 @@ s32 sysmgr_setup(const struct sysmgr_config *cfg)
 	if (status >= 0) {
 		status = notify_setup(&config->notify_cfg);
 		if (status < 0) {
-			printk(KERN_ERR "sysmgr_setup : notify_setup "
+			pr_err("sysmgr_setup : notify_setup "
 				"failed [0x%x]\n", status);
 		} else {
-			printk(KERN_ERR "notify_setup : status [0x%x]\n" ,
+			pr_err("notify_setup : status [0x%x]\n" ,
 				status);
 			sysmgr_state.notify_init_flag = true;
 		}
@@ -447,10 +447,10 @@ s32 sysmgr_setup(const struct sysmgr_config *cfg)
 	if (status >= 0) {
 		status = nameserver_setup();
 		if (status < 0) {
-			printk(KERN_ERR "sysmgr_setup : nameserver_setup "
+			pr_err("sysmgr_setup : nameserver_setup "
 				"failed [0x%x]\n", status);
 		} else {
-			printk(KERN_ERR "nameserver_setup : status [0x%x]\n" ,
+			pr_err("nameserver_setup : status [0x%x]\n" ,
 				status);
 			sysmgr_state.nameserver_init_flag = true;
 		}
@@ -460,10 +460,10 @@ s32 sysmgr_setup(const struct sysmgr_config *cfg)
 	if (status >= 0) {
 		status = gatepeterson_setup(&config->gatepeterson_cfg);
 		if (status < 0) {
-			printk(KERN_ERR "sysmgr_setup : gatepeterson_setup "
+			pr_err("sysmgr_setup : gatepeterson_setup "
 				"failed [0x%x]\n", status);
 		} else {
-			printk(KERN_ERR "gatepeterson_setup : status [0x%x]\n" ,
+			pr_err("gatepeterson_setup : status [0x%x]\n" ,
 				status);
 			sysmgr_state.gatepeterson_init_flag = true;
 		}
@@ -473,10 +473,10 @@ s32 sysmgr_setup(const struct sysmgr_config *cfg)
 	if (status >= 0) {
 		status = messageq_setup(&config->messageq_cfg);
 		if (status < 0) {
-			printk(KERN_ERR "sysmgr_setup : messageq_setup "
+			pr_err("sysmgr_setup : messageq_setup "
 				"failed [0x%x]\n", status);
 		} else {
-			printk(KERN_ERR "messageq_setup : status [0x%x]\n" ,
+			pr_err("messageq_setup : status [0x%x]\n" ,
 				status);
 			sysmgr_state.messageq_init_flag = true;
 		}
@@ -486,10 +486,10 @@ s32 sysmgr_setup(const struct sysmgr_config *cfg)
 	if (status >= 0) {
 		status = heapbuf_setup(&config->heapbuf_cfg);
 		if (status < 0) {
-			printk(KERN_ERR "sysmgr_setup : heapbuf_setup "
+			pr_err("sysmgr_setup : heapbuf_setup "
 				"failed [0x%x]\n", status);
 		} else {
-			printk(KERN_ERR "heapbuf_setup : status [0x%x]\n" ,
+			pr_err("heapbuf_setup : status [0x%x]\n" ,
 				status);
 			sysmgr_state.heapbuf_init_flag = true;
 		}
@@ -500,11 +500,11 @@ s32 sysmgr_setup(const struct sysmgr_config *cfg)
 		status = listmp_sharedmemory_setup(
 				&config->listmp_sharedmemory_cfg);
 		if (status < 0) {
-			printk(KERN_ERR "sysmgr_setup : "
+			pr_err("sysmgr_setup : "
 				"listmp_sharedmemory_setup failed [0x%x]\n",
 				status);
 		} else {
-			printk(KERN_ERR "listmp_sharedmemory_setup : "
+			pr_err("listmp_sharedmemory_setup : "
 				"status [0x%x]\n" , status);
 			sysmgr_state.listmp_sharedmemory_init_flag = true;
 		}
@@ -515,11 +515,11 @@ s32 sysmgr_setup(const struct sysmgr_config *cfg)
 		status = messageq_transportshm_setup(
 				 &config->messageq_transportshm_cfg);
 		if (status < 0) {
-			printk(KERN_ERR "sysmgr_setup : "
+			pr_err("sysmgr_setup : "
 				"messageq_transportshm_setup failed [0x%x]\n",
 				status);
 		} else {
-			printk(KERN_ERR "messageq_transportshm_setup : "
+			pr_err("messageq_transportshm_setup : "
 				"status [0x%x]\n", status);
 			sysmgr_state.messageq_transportshm_init_flag = true;
 		}
@@ -529,11 +529,11 @@ s32 sysmgr_setup(const struct sysmgr_config *cfg)
 	if (status >= 0) {
 		status = notify_ducatidrv_setup(&config->notify_ducatidrv_cfg);
 		if (status < 0) {
-			printk(KERN_ERR "sysmgr_setup : "
+			pr_err("sysmgr_setup : "
 				"notify_ducatidrv_setup failed [0x%x]\n",
 				status);
 		} else {
-			printk(KERN_ERR "notify_ducatidrv_setup : "
+			pr_err("notify_ducatidrv_setup : "
 				"status [0x%x]\n" , status);
 			sysmgr_state.notify_ducatidrv_init_flag = true;
 		}
@@ -544,11 +544,11 @@ s32 sysmgr_setup(const struct sysmgr_config *cfg)
 		status = nameserver_remotenotify_setup(
 				 &config->nameserver_remotenotify_cfg);
 		if (status < 0) {
-			printk(KERN_ERR "sysmgr_setup : "
+			pr_err("sysmgr_setup : "
 				"nameserver_remotenotify_setup failed [0x%x]\n",
 				status);
 		} else {
-			printk(KERN_ERR "nameserver_remotenotify_setup : "
+			pr_err("nameserver_remotenotify_setup : "
 				"status [0x%x]\n" , status);
 			sysmgr_state.nameserver_remotenotify_init_flag = true;
 		}
@@ -558,10 +558,10 @@ s32 sysmgr_setup(const struct sysmgr_config *cfg)
 		/* Call platform setup function */
 		status = platform_setup(config);
 		if (status < 0) {
-			printk(KERN_ERR "sysmgr_setup : platform_setup "
+			pr_err("sysmgr_setup : platform_setup "
 				"failed [0x%x]\n", status);
 		} else {
-			printk(KERN_ERR "platform_setup : status [0x%x]\n" ,
+			pr_err("platform_setup : status [0x%x]\n" ,
 				status);
 			sysmgr_state.platform_init_flag = true;
 		}
@@ -602,7 +602,7 @@ s32 sysmgr_destroy(void)
 	if (sysmgr_state.platform_init_flag == true) {
 		status = platform_destroy();
 		if (status < 0) {
-			printk(KERN_ERR "sysmgr_destroy : platform_destroy "
+			pr_err("sysmgr_destroy : platform_destroy "
 				"failed [0x%x]\n", status);
 		} else {
 			sysmgr_state.platform_init_flag = false;
@@ -613,7 +613,7 @@ s32 sysmgr_destroy(void)
 	if (sysmgr_state.nameserver_remotenotify_init_flag == true) {
 		status = nameserver_remotenotify_destroy();
 		if (status < 0) {
-			printk(KERN_ERR "sysmgr_destroy : "
+			pr_err("sysmgr_destroy : "
 				"nameserver_remotenotify_destroy "
 				"failed [0x%x]\n", status);
 		} else {
@@ -626,7 +626,7 @@ s32 sysmgr_destroy(void)
 	if (sysmgr_state.notify_ducatidrv_init_flag == true) {
 		status = notify_ducatidrv_destroy();
 		if (status < 0) {
-			printk(KERN_ERR "sysmgr_destroy : "
+			pr_err("sysmgr_destroy : "
 				"notify_ducatidrv_destroy failed [0x%x]\n",
 				status);
 		} else {
@@ -638,7 +638,7 @@ s32 sysmgr_destroy(void)
 	if (sysmgr_state.messageq_transportshm_init_flag == true) {
 		status = messageq_transportshm_destroy();
 		if (status < 0) {
-			printk(KERN_ERR "sysmgr_destroy : "
+			pr_err("sysmgr_destroy : "
 				"messageq_transportshm_destroy failed [0x%x]\n",
 				status);
 		} else {
@@ -651,7 +651,7 @@ s32 sysmgr_destroy(void)
 	if (sysmgr_state.listmp_sharedmemory_init_flag == true) {
 		status = listmp_sharedmemory_destroy();
 		if (status < 0) {
-			printk(KERN_ERR "sysmgr_destroy : "
+			pr_err("sysmgr_destroy : "
 				"listmp_sharedmemory_destroy failed [0x%x]\n",
 				status);
 		} else {
@@ -664,7 +664,7 @@ s32 sysmgr_destroy(void)
 	if (sysmgr_state.heapbuf_init_flag == true) {
 		status = heapbuf_destroy();
 		if (status < 0) {
-			printk(KERN_ERR "sysmgr_destroy : heapbuf_destroy "
+			pr_err("sysmgr_destroy : heapbuf_destroy "
 				"failed [0x%x]\n", status);
 		} else {
 			sysmgr_state.heapbuf_init_flag = false;
@@ -675,7 +675,7 @@ s32 sysmgr_destroy(void)
 	if (sysmgr_state.messageq_init_flag == true) {
 		status = messageq_destroy();
 		if (status < 0) {
-			printk(KERN_ERR "sysmgr_destroy : messageq_destroy "
+			pr_err("sysmgr_destroy : messageq_destroy "
 				"failed [0x%x]\n", status);
 		} else {
 			sysmgr_state.messageq_init_flag = false;
@@ -686,7 +686,7 @@ s32 sysmgr_destroy(void)
 	if (sysmgr_state.gatepeterson_init_flag == true) {
 		status = gatepeterson_destroy();
 		if (status < 0) {
-			printk(KERN_ERR "sysmgr_destroy : "
+			pr_err("sysmgr_destroy : "
 				"gatepeterson_destroy failed [0x%x]\n", status);
 		} else {
 			sysmgr_state.gatepeterson_init_flag = false;
@@ -697,7 +697,7 @@ s32 sysmgr_destroy(void)
 	if (sysmgr_state.nameserver_init_flag == true) {
 		status = nameserver_destroy();
 		if (status < 0) {
-			printk(KERN_ERR "sysmgr_destroy : nameserver_destroy "
+			pr_err("sysmgr_destroy : nameserver_destroy "
 				"failed [0x%x]\n", status);
 		} else {
 			sysmgr_state.nameserver_init_flag = false;
@@ -708,7 +708,7 @@ s32 sysmgr_destroy(void)
 	if (sysmgr_state.notify_init_flag == true) {
 		status = notify_destroy();
 		if (status < 0) {
-			printk(KERN_ERR "sysmgr_destroy : sysmgr_destroy "
+			pr_err("sysmgr_destroy : sysmgr_destroy "
 				"failed [0x%x]\n", status);
 		} else {
 			sysmgr_state.notify_init_flag = false;
@@ -719,7 +719,7 @@ s32 sysmgr_destroy(void)
 	if (sysmgr_state.sharedregion_init_flag == true) {
 		status = sharedregion_destroy();
 		if (status < 0) {
-			printk(KERN_ERR "sysmgr_destroy : "
+			pr_err("sysmgr_destroy : "
 				"sharedregion_destroy failed [0x%x]\n", status);
 		} else {
 			sysmgr_state.sharedregion_init_flag = false;
@@ -730,7 +730,7 @@ s32 sysmgr_destroy(void)
 	if (sysmgr_state.proc_mgr_init_flag == true) {
 		status = proc_mgr_destroy();
 		if (status < 0) {
-			printk(KERN_ERR "sysmgr_destroy : proc_mgr_destroy "
+			pr_err("sysmgr_destroy : proc_mgr_destroy "
 				"failed [0x%x]\n", status);
 		} else {
 			sysmgr_state.proc_mgr_init_flag = false;
@@ -741,7 +741,7 @@ s32 sysmgr_destroy(void)
 	if (sysmgr_state.multiproc_init_flag == true) {
 		status = multiproc_destroy();
 		if (status < 0) {
-			printk(KERN_ERR "sysmgr_destroy : multiproc_destroy "
+			pr_err("sysmgr_destroy : multiproc_destroy "
 				"failed [0x%x]\n", status);
 		} else {
 			sysmgr_state.proc_mgr_init_flag = false;
@@ -752,7 +752,7 @@ s32 sysmgr_destroy(void)
 	if (sysmgr_state.platform_mem_init_flag == true) {
 		status = platform_mem_destroy();
 		if (status < 0) {
-			printk(KERN_ERR "sysmgr_destroy : platform_mem_destroy "
+			pr_err("sysmgr_destroy : platform_mem_destroy "
 				"failed [0x%x]\n", status);
 		} else {
 			sysmgr_state.platform_mem_init_flag = false;
@@ -763,7 +763,7 @@ s32 sysmgr_destroy(void)
 
 exit:
 	if (status < 0) {
-		printk(KERN_ERR "sysmgr_destroy : failed with "
+		pr_err("sysmgr_destroy : failed with "
 			"status = [0x%x]\n", status);
 	}
 	return status;
@@ -781,7 +781,7 @@ void sysmgr_set_boot_load_page(u16 proc_id, u32 boot_load_page)
 		(struct sysmgr_boot_load_page *) boot_load_page;
 
 	if ((proc_id < 0) || (proc_id >= MULTIPROC_MAXPROCESSORS)) {
-		printk(KERN_ERR
+		pr_err(
 		"sysmgr_set_boot_load_page failed: Invalid proc_id passed\n");
 		return;
 	}
@@ -804,17 +804,17 @@ void sysmgr_wait_for_scalability_info(u16 proc_id)
 	VOLATILE struct sysmgr_boot_load_page *temp = NULL;
 
 	if ((proc_id < 0) || (proc_id >= MULTIPROC_MAXPROCESSORS)) {
-		printk(KERN_ERR "sysmgr_wait_for_scalability_info failed: "
+		pr_err("sysmgr_wait_for_scalability_info failed: "
 			"Invalid proc_id passed\n");
 		return;
 	}
 	temp = sysmgr_state.boot_load_page[proc_id];
 
-	printk(KERN_ERR "sysmgr_wait_for_scalability_info: BF while temp->handshake:%x\n",
+	pr_err("sysmgr_wait_for_scalability_info: BF while temp->handshake:%x\n",
 		temp->handshake);
 	while (temp->handshake != SYSMGR_SCALABILITYHANDSHAKESTAMP)
 		;
-	printk(KERN_ERR "sysmgr_wait_for_scalability_info:AF while temp->handshake:%x\n",
+	pr_err("sysmgr_wait_for_scalability_info:AF while temp->handshake:%x\n",
 		temp->handshake);
 
 	/* Reset the handshake value for reverse synchronization */
@@ -832,7 +832,7 @@ void sysmgr_wait_for_slave_setup(u16 proc_id)
 	VOLATILE struct sysmgr_boot_load_page *temp = NULL;
 
 	if ((proc_id < 0) || (proc_id >= MULTIPROC_MAXPROCESSORS)) {
-		printk(KERN_ERR "sysmgr_wait_for_slave_setup failed: "
+		pr_err("sysmgr_wait_for_slave_setup failed: "
 			"Invalid proc_id passed\n");
 		return;
 	}
diff --git a/drivers/dsp/syslink/multicore_ipc/transportshm.c b/drivers/dsp/syslink/multicore_ipc/transportshm.c
index 9197f83da22..621bcaf4a59 100644
--- a/drivers/dsp/syslink/multicore_ipc/transportshm.c
+++ b/drivers/dsp/syslink/multicore_ipc/transportshm.c
@@ -202,7 +202,7 @@ void transportshm_get_config(struct transportshm_config *cfg)
 	return;
 
 exit:
-	printk(KERN_ERR "transportshm_get_config: Argument of type"
+	pr_err("transportshm_get_config: Argument of type"
 		"(struct transportshm_config *) passed is null!\n");
 }
 
@@ -253,8 +253,7 @@ int transportshm_setup(const struct transportshm_config *cfg)
 		/* @retval TRANSPORTSHM_E_FAIL Failed to create
 		GateMutex! */
 		status = TRANSPORTSHM_E_FAIL;
-		printk(KERN_ERR "transportshm_setup: Failed to create "
-			"mutex!\n");
+		pr_err("transportshm_setup: Failed to create mutex!\n");
 		atomic_set(&transportshm_module->ref_count,
 				TRANSPORTSHM_MAKE_MAGICSTAMP(0));
 		goto exit;
@@ -269,8 +268,7 @@ int transportshm_setup(const struct transportshm_config *cfg)
 	return status;
 
 exit:
-	printk(KERN_ERR "transportshm_setup failed: status = 0x%x",
-		status);
+	pr_err("transportshm_setup failed: status = 0x%x", status);
 	return status;
 }
 
@@ -343,8 +341,7 @@ int transportshm_destroy(void)
 
 exit:
 	if (status < 0)
-		printk(KERN_ERR "transportshm_destroy failed: "
-			"status = 0x%x\n", status);
+		pr_err("transportshm_destroy failed: status = 0x%x\n", status);
 	return status;
 }
 
@@ -360,13 +357,13 @@ void transportshm_params_init(struct transportshm_params *params)
 			&(transportshm_module->ref_count),
 			TRANSPORTSHM_MAKE_MAGICSTAMP(0),
 			TRANSPORTSHM_MAKE_MAGICSTAMP(1)) == true)) {
-		printk(KERN_ERR "transportshm_params_init: Module was "
+		pr_err("transportshm_params_init: Module was "
 				" not initialized\n");
 		goto exit;
 	}
 
 	if (WARN_ON(params == NULL)) {
-		printk(KERN_ERR "transportshm_params_init: Argument of"
+		pr_err("transportshm_params_init: Argument of"
 				" type (struct transportshm_params *) "
 				"is NULL!");
 		goto exit;
@@ -423,8 +420,7 @@ void *transportshm_create(u16 proc_id,
 	return handle;
 
 exit:
-	printk(KERN_ERR "transportshm_create failed: status = 0x%x\n",
-		status);
+	pr_err("transportshm_create failed: status = 0x%x\n", status);
 	return handle;
 }
 
@@ -455,7 +451,7 @@ int transportshm_delete(void **handle_ptr)
 	}
 	if (WARN_ON(*handle_ptr == NULL)) {
 		status = -EINVAL;
-		printk(KERN_WARNING "transportshm_delete: Invalid NULL"
+		pr_warn("transportshm_delete: Invalid NULL"
 			" mqtshm_handle specified! status = 0x%x\n", status);
 		goto exit;
 	}
@@ -487,7 +483,7 @@ int transportshm_delete(void **handle_ptr)
 		if (handle->local_list != NULL) {
 			status = listmp_delete(&handle->local_list);
 			if (status < 0)
-				printk(KERN_WARNING "transportshm_delete: "
+				pr_warn("transportshm_delete: "
 						"Failed to delete local listmp "
 						"instance!\n");
 		}
@@ -496,7 +492,7 @@ int transportshm_delete(void **handle_ptr)
 			tmp_status = listmp_close(&handle->remote_list);
 			if ((tmp_status < 0) && (status >= 0)) {
 				status = tmp_status;
-				printk(KERN_WARNING "transportshm_delete: "
+				pr_warn("transportshm_delete: "
 						"Failed to close remote listmp "
 						"instance!\n");
 			}
@@ -511,7 +507,7 @@ int transportshm_delete(void **handle_ptr)
 						handle->notify_event_id);
 		if (tmp_status < 0) {
 			status = tmp_status;
-			printk(KERN_WARNING "transportshm_delete: Failed to "
+			pr_warn("transportshm_delete: Failed to "
 					"unregister notify event!\n");
 		}
 
@@ -523,7 +519,7 @@ int transportshm_delete(void **handle_ptr)
 
 exit:
 	if (status < 0)
-		printk(KERN_ERR "transportshm_delete failed: "
+		pr_err("transportshm_delete failed: "
 			"status = 0x%x\n", status);
 	return status;
 }
@@ -605,8 +601,7 @@ transportshm_open_by_addr(void *shared_addr, void **handle_ptr)
 	return status;
 
 exit:
-	printk(KERN_ERR "transportshm_open_by_addr failed: status = 0x%x\n",
-		status);
+	pr_err("transportshm_open_by_addr failed: status = 0x%x\n", status);
 	return status;
 }
 
@@ -659,7 +654,7 @@ transportshm_close(void **handle_ptr)
 		status = gatemp_close(&obj->gate);
 		if (status < 0) {
 			status = TRANSPORTSHM_E_FAIL;
-			printk(KERN_ERR "transportshm_close: "
+			pr_err("transportshm_close: "
 				"gatemp_close failed, status [0x%x]\n",
 				status);
 		}
@@ -669,7 +664,7 @@ transportshm_close(void **handle_ptr)
 		tmp_status = listmp_close(&obj->local_list);
 		if ((tmp_status < 0) && (status >= 0)) {
 			status = TRANSPORTSHM_E_FAIL;
-			printk(KERN_ERR "transportshm_close: "
+			pr_err("transportshm_close: "
 				"listmp_close(local_list) failed, "
 				"status [0x%x]\n", status);
 		}
@@ -679,7 +674,7 @@ transportshm_close(void **handle_ptr)
 		tmp_status = listmp_close(&obj->remote_list);
 		if ((tmp_status < 0) && (status >= 0)) {
 			status = TRANSPORTSHM_E_FAIL;
-			printk(KERN_ERR "transportshm_close: "
+			pr_err("transportshm_close: "
 				"listmp_close(remote_list) failed, "
 				"status [0x%x]\n", status);
 		}
@@ -697,8 +692,7 @@ transportshm_close(void **handle_ptr)
 	*handle_ptr = NULL;
 exit:
 	if (status < 0)
-		printk(KERN_ERR "transportshm_close failed: status = 0x%x\n",
-								status);
+		pr_err("transportshm_close failed: status = 0x%x\n", status);
 	return status;
 }
 
@@ -744,7 +738,7 @@ int transportshm_put(void *handle, void *msg)
 	/*key = gatemp_enter(obj->gate);*/
 	status = listmp_put_tail(obj->remote_list, (struct listmp_elem *) msg);
 	if (status < 0) {
-		printk(KERN_ERR "transportshm_put: Failed to put "
+		pr_err("transportshm_put: Failed to put "
 			"message in the shared list! status = 0x%x\n", status);
 		goto exit_with_gate;
 	}
@@ -758,7 +752,7 @@ int transportshm_put(void *handle, void *msg)
 
 
 notify_send_fail:
-	printk(KERN_ERR "transportshm_put: Notification to remote "
+	pr_err("transportshm_put: Notification to remote "
 		"processor failed, status = 0x%x\n", status);
 	/* If sending the event failed, then remove the element from the */
 	/* list.  Ignore the status of remove. */
@@ -768,8 +762,7 @@ exit_with_gate:
 	/*gatemp_leave(obj->gate, key);*/
 exit:
 	if (status < 0)
-		printk(KERN_ERR "transportshm_put failed: "
-			"status = 0x%x\n", status);
+		pr_err("transportshm_put failed: status = 0x%x\n", status);
 	return status;
 }
 
@@ -782,7 +775,7 @@ int transportshm_control(void *handle, u32 cmd, u32 *cmd_arg)
 {
 	BUG_ON(handle == NULL);
 
-	printk(KERN_ALERT "transportshm_control not supported!\n");
+	pr_err("transportshm_control not supported!\n");
 	return TRANSPORTSHM_E_NOTSUPPORTED;
 }
 
@@ -845,7 +838,7 @@ u32 transportshm_shared_mem_req(const struct transportshm_params *params)
 
 exit:
 	if (status < 0)
-		printk(KERN_ERR "transportshm_shared_mem_req failed: "
+		pr_err("transportshm_shared_mem_req failed: "
 			"status = 0x%x\n", status);
 
 	return mem_req;
@@ -902,8 +895,7 @@ static void _transportshm_notify_fxn(u16 proc_id, u16 line_id, u32 event_no,
 exit:
 	mutex_unlock(transportshm_state.gate_handle);
 mutex_fail:
-	printk(KERN_ERR "transportshm_notify_fxn: argument passed is "
-		"NULL!\n");
+	pr_err("transportshm_notify_fxn: argument passed is NULL!\n");
 	return;
 }
 
diff --git a/drivers/dsp/syslink/multicore_ipc/transportshm_setup.c b/drivers/dsp/syslink/multicore_ipc/transportshm_setup.c
index d37d691a68a..a348c03f6b0 100644
--- a/drivers/dsp/syslink/multicore_ipc/transportshm_setup.c
+++ b/drivers/dsp/syslink/multicore_ipc/transportshm_setup.c
@@ -111,7 +111,7 @@ int transportshm_setup_attach(u16 remote_proc_id, u32 *shared_addr)
 
 exit:
 	if (status < 0)
-		printk(KERN_ERR "transportshm_setup_attach failed! status "
+		pr_err("transportshm_setup_attach failed! status "
 			"= 0x%x", status);
 	return status;
 }
@@ -156,7 +156,7 @@ int transportshm_setup_detach(u16 remote_proc_id)
 
 exit:
 	if (status < 0)
-		printk(KERN_ERR "transportshm_setup_detach failed! status "
+		pr_err("transportshm_setup_detach failed! status "
 			"= 0x%x", status);
 	return status;
 }
@@ -189,7 +189,7 @@ u32 transportshm_setup_shared_mem_req(u32 *shared_addr)
 
 exit:
 	if (status < 0)
-		printk(KERN_ERR "transportshm_setup_shared_mem_req failed! "
+		pr_err("transportshm_setup_shared_mem_req failed! "
 			"status = 0x%x", status);
 	return mem_req;
 }
diff --git a/drivers/dsp/syslink/notify_ducatidriver/notify_ducati.c b/drivers/dsp/syslink/notify_ducatidriver/notify_ducati.c
index 7d36a3068d2..5ffc0991ee3 100644
--- a/drivers/dsp/syslink/notify_ducatidriver/notify_ducati.c
+++ b/drivers/dsp/syslink/notify_ducatidriver/notify_ducati.c
@@ -180,7 +180,7 @@ void notify_ducatidrv_get_config(struct notify_ducatidrv_config *cfg)
 
 exit:
 	if (status < 0) {
-		printk(KERN_ERR "notify_ducatidrv_get_config failed! "
+		pr_err("notify_ducatidrv_get_config failed! "
 			"status = 0x%x", status);
 	}
 	return;
@@ -231,7 +231,7 @@ int notify_ducatidrv_setup(struct notify_ducatidrv_config *cfg)
 	if (ducati_mbox == NULL) {
 		ducati_mbox = omap_mbox_get("mailbox-2", &ducati_notify_nb);
 		if (ducati_mbox == NULL) {
-			printk(KERN_ERR "Failed in omap_mbox_get(ducati)\n");
+			pr_err("Failed in omap_mbox_get(ducati)\n");
 			status = NOTIFY_E_INVALIDSTATE;
 			goto error_mailbox_get_failed;
 		}
@@ -241,7 +241,7 @@ int notify_ducatidrv_setup(struct notify_ducatidrv_config *cfg)
 	if (!tesla_mbox) {
 		tesla_mbox = omap_mbox_get("mailbox-1", &ducati_notify_nb);
 		if (!tesla_mbox) {
-			printk(KERN_ERR "Failed in omap_mbox_get(tesla)\n");
+			pr_err("Failed in omap_mbox_get(tesla)\n");
 			status = NOTIFY_E_INVALIDSTATE;
 			goto error_mailbox_get_failed;
 		}
@@ -253,7 +253,7 @@ error_mailbox_get_failed:
 error_exit:
 	atomic_set(&(notify_ducatidriver_state.ref_count),
 			NOTIFYDUCATIDRIVER_MAKE_MAGICSTAMP(0));
-	printk(KERN_ERR "notify_ducatidrv_setup failed! status = 0x%x", status);
+	pr_err("notify_ducatidrv_setup failed! status = 0x%x", status);
 	return status;
 }
 EXPORT_SYMBOL(notify_ducatidrv_setup);
@@ -307,7 +307,7 @@ int notify_ducatidrv_destroy(void)
 
 exit:
 	if (status < 0) {
-		printk(KERN_ERR "notify_ducatidrv_destroy failed! "
+		pr_err("notify_ducatidrv_destroy failed! "
 			"status = 0x%x", status);
 	}
 	return status;
@@ -337,7 +337,7 @@ void notify_ducatidrv_params_init(struct notify_ducatidrv_params *params)
 
 exit:
 	if (status < 0) {
-		printk(KERN_ERR "notify_ducatidrv_params_init failed! "
+		pr_err("notify_ducatidrv_params_init failed! "
 			"status = 0x%x", status);
 	}
 	return;
@@ -567,8 +567,7 @@ error_unlock_and_return:
 	/* Leave critical section protection. */
 	mutex_unlock(notify_ducatidriver_state.gate_handle);
 exit:
-	printk(KERN_ERR "notify_ducatidrv_create failed! status = 0x%x",
-		status);
+	pr_err("notify_ducatidrv_create failed! status = 0x%x", status);
 	return NULL;
 }
 EXPORT_SYMBOL(notify_ducatidrv_create);
@@ -640,10 +639,8 @@ int notify_ducatidrv_delete(struct notify_ducatidrv_object **handle_ptr)
 	}
 
 exit:
-	if (status < 0) {
-		printk(KERN_ERR "notify_ducatidrv_delete failed! "
-			"status = 0x%x", status);
-	}
+	if (status < 0)
+		pr_err("notify_ducatidrv_delete failed! status = 0x%x", status);
 	return status;
 }
 EXPORT_SYMBOL(notify_ducatidrv_delete);
@@ -734,7 +731,7 @@ int notify_ducatidrv_register_event(struct notify_driver_object *handle,
 
 exit:
 	if (status < 0) {
-		printk(KERN_ERR "notify_ducatidrv_register_event failed! "
+		pr_err("notify_ducatidrv_register_event failed! "
 			"status = 0x%x", status);
 	}
 	return status;
@@ -825,7 +822,7 @@ int notify_ducatidrv_unregister_event(struct notify_driver_object *handle,
 
 exit:
 	if (status < 0) {
-		printk(KERN_ERR "notify_ducatidrv_unregister_event failed! "
+		pr_err("notify_ducatidrv_unregister_event failed! "
 			"status = 0x%x", status);
 	}
 	return status;
@@ -975,7 +972,7 @@ int notify_ducatidrv_send_event(struct notify_driver_object *handle,
 
 exit:
 	if (status < 0) {
-		printk(KERN_ERR "notify_ducatidrv_sendevent failed! "
+		pr_err("notify_ducatidrv_sendevent failed! "
 			"status = 0x%x", status);
 	}
 	return status;
@@ -1022,7 +1019,7 @@ int notify_ducatidrv_disable(struct notify_driver_object *handle)
 
 exit:
 	if (status < 0) {
-		printk(KERN_ERR "notify_ducatidrv_disable failed! "
+		pr_err("notify_ducatidrv_disable failed! "
 			"status = 0x%x", status);
 	}
 	/*No flags to be returned. */
@@ -1071,7 +1068,7 @@ void notify_ducatidrv_enable(struct notify_driver_object *handle)
 
 exit:
 	if (status < 0) {
-		printk(KERN_ERR "notify_ducatidrv_enable failed! "
+		pr_err("notify_ducatidrv_enable failed! "
 			"status = 0x%x", status);
 	}
 	return;
@@ -1178,7 +1175,7 @@ void notify_ducatidrv_disable_event(struct notify_driver_object *handle,
 
 exit:
 	if (status < 0) {
-		printk(KERN_ERR "notify_ducatidrv_disable_event failed! "
+		pr_err("notify_ducatidrv_disable_event failed! "
 			"status = 0x%x", status);
 	}
 	return;
@@ -1236,7 +1233,7 @@ void notify_ducatidrv_enable_event(struct notify_driver_object *handle,
 
 exit:
 	if (status < 0) {
-		printk(KERN_ERR "notify_ducatidrv_enable_event failed! "
+		pr_err("notify_ducatidrv_enable_event failed! "
 			"status = 0x%x", status);
 	}
 	return;
@@ -1286,7 +1283,7 @@ uint notify_ducatidrv_shared_mem_req(
 
 exit:
 	if (status < 0) {
-		printk(KERN_ERR "notify_ducatidrv_shared_mem_req failed!"
+		pr_err("notify_ducatidrv_shared_mem_req failed!"
 			" status = 0x%x", status);
 	}
 	return mem_req;
diff --git a/drivers/dsp/syslink/omap_notify/drv_notify.c b/drivers/dsp/syslink/omap_notify/drv_notify.c
index 542c8c37c6a..efa413f48ec 100644
--- a/drivers/dsp/syslink/omap_notify/drv_notify.c
+++ b/drivers/dsp/syslink/omap_notify/drv_notify.c
@@ -570,7 +570,7 @@ int notify_drv_ioctl(struct inode *inode, struct file *filp, u32 cmd,
 		u32 pid = *((u32 *)args);
 		status = notify_drv_attach(pid);
 		if (status < 0)
-			printk(KERN_ERR "NOTIFY_ATTACH FAILED\n");
+			pr_err("NOTIFY_ATTACH FAILED\n");
 		else {
 			u32 *data = kmalloc(sizeof(u32), GFP_KERNEL);
 			if (WARN_ON(!data)) {
@@ -597,7 +597,7 @@ int notify_drv_ioctl(struct inode *inode, struct file *filp, u32 cmd,
 		else
 			status = notify_drv_detach(pid, true);
 		if (status < 0)
-			printk(KERN_ERR "NOTIFY_DETACH FAILED\n");
+			pr_err("NOTIFY_DETACH FAILED\n");
 		else
 			remove_pr_res(pr_ctxt, info);
 	}
@@ -693,7 +693,7 @@ int notify_drv_ioctl(struct inode *inode, struct file *filp, u32 cmd,
 		/* This does not impact return status of this function,so retval
 		 * comment is not used. */
 		status = NOTIFY_E_INVALIDARG;
-		printk(KERN_ERR "not valid command\n");
+		pr_err("not valid command\n");
 	}
 	break;
 	}
@@ -735,10 +735,8 @@ static void _notify_drv_callback(u16 proc_id, u16 line_id, u32 event_id,
 				event_id, payload, cbck->func, cbck->param);
 
 func_end:
-	if (status < 0) {
-		printk(KERN_ERR "_notify_drv_callback failed! status = 0x%x",
-			status);
-	}
+	if (status < 0)
+		pr_err("_notify_drv_callback failed! status = 0x%x", status);
 	return;
 }
 
@@ -801,7 +799,7 @@ static int _notify_drv_add_buf_by_pid(u16 proc_id, u16 line_id, u32 pid,
 
 func_end:
 	if (status < 0) {
-		printk(KERN_ERR "_notify_drv_add_buf_by_pid failed! "
+		pr_err("_notify_drv_add_buf_by_pid failed! "
 			"status = 0x%x", status);
 	}
 	return status;
diff --git a/drivers/dsp/syslink/omap_notify/notify.c b/drivers/dsp/syslink/omap_notify/notify.c
index cbd72c0989a..6d4614ccad2 100644
--- a/drivers/dsp/syslink/omap_notify/notify.c
+++ b/drivers/dsp/syslink/omap_notify/notify.c
@@ -71,10 +71,8 @@ void notify_get_config(struct notify_config *cfg)
 		memcpy(cfg, &notify_state.cfg, sizeof(struct notify_config));
 
 exit:
-	if (retval < 0) {
-		printk(KERN_ERR "notify_get_config failed! status = 0x%x",
-			retval);
-	}
+	if (retval < 0)
+		pr_err("notify_get_config failed! status = 0x%x", retval);
 	return;
 }
 EXPORT_SYMBOL(notify_get_config);
@@ -140,7 +138,7 @@ local_notify_fail:
 	kfree(notify_state.gate_handle);
 exit:
 	atomic_set(&notify_state.ref_count, NOTIFY_MAKE_MAGICSTAMP(0));
-	printk(KERN_ERR "notify_setup failed! status = 0x%x", status);
+	pr_err("notify_setup failed! status = 0x%x", status);
 	return status;
 }
 EXPORT_SYMBOL(notify_setup);
@@ -179,7 +177,7 @@ int notify_destroy(void)
 
 exit:
 	if (status < 0)
-		printk(KERN_ERR "notify_destroy failed! status = 0x%x", status);
+		pr_err("notify_destroy failed! status = 0x%x", status);
 	return status;
 }
 EXPORT_SYMBOL(notify_destroy);
@@ -246,7 +244,7 @@ notify_handle_fail:
 	obj = NULL;
 exit:
 	if (status < 0)
-		printk(KERN_ERR "notify_create failed! status = 0x%x", status);
+		pr_err("notify_create failed! status = 0x%x", status);
 	return obj;
 }
 
@@ -290,7 +288,7 @@ int notify_delete(struct notify_object **handle_ptr)
 
 exit:
 	if (status < 0)
-		printk(KERN_ERR "notify_delete failed! status = 0x%x", status);
+		pr_err("notify_delete failed! status = 0x%x", status);
 	return status;
 }
 
@@ -375,10 +373,8 @@ int notify_register_event(u16 proc_id, u16 line_id, u32 event_id,
 	}
 
 exit:
-	if (status < 0) {
-		printk(KERN_ERR "notify_register_event failed! "
-			"status = 0x%x", status);
-	}
+	if (status < 0)
+		pr_err("notify_register_event failed! status = 0x%x", status);
 	return status;
 }
 EXPORT_SYMBOL(notify_register_event);
@@ -452,7 +448,7 @@ int notify_register_event_single(u16 proc_id, u16 line_id, u32 event_id,
 	}
 exit:
 	if (status < 0) {
-		printk(KERN_ERR "notify_register_event_single failed! "
+		pr_err("notify_register_event_single failed! "
 			"status = 0x%x", status);
 	}
 	return status;
@@ -548,7 +544,7 @@ int notify_unregister_event(u16 proc_id, u16 line_id, u32 event_id,
 	kfree(listener);
 exit:
 	if (status < 0) {
-		printk(KERN_ERR "notify_unregister_event failed! "
+		pr_err("notify_unregister_event failed! "
 			"status = 0x%x", status);
 	}
 	return status;
@@ -618,7 +614,7 @@ int notify_unregister_event_single(u16 proc_id, u16 line_id, u32 event_id)
 	}
 exit:
 	if (status < 0) {
-		printk(KERN_ERR "notify_unregister_event_single failed! "
+		pr_err("notify_unregister_event_single failed! "
 			"status = 0x%x", status);
 	}
 	return status;
@@ -706,10 +702,8 @@ int notify_send_event(u16 proc_id, u16 line_id, u32 event_id, u32 payload,
 		}
 	}
 exit:
-	if (status < 0) {
-		printk(KERN_ERR "notify_send_event failed! status = 0x%x",
-			status);
-	}
+	if (status < 0)
+		pr_err("notify_send_event failed! status = 0x%x", status);
 	return status;
 }
 EXPORT_SYMBOL(notify_send_event);
@@ -768,7 +762,7 @@ u32 notify_disable(u16 proc_id, u16 line_id)
 	mutex_unlock(&obj->lock);
 exit:
 	if (status < 0)
-		printk(KERN_ERR "notify_disable failed! status = 0x%x", status);
+		pr_err("notify_disable failed! status = 0x%x", status);
 	return key;
 }
 EXPORT_SYMBOL(notify_disable);
@@ -831,7 +825,7 @@ void notify_restore(u16 proc_id, u16 line_id, u32 key)
 	mutex_unlock(&obj->lock);
 exit:
 	if (status < 0)
-		printk(KERN_ERR "notify_restore failed! status = 0x%x", status);
+		pr_err("notify_restore failed! status = 0x%x", status);
 	return;
 }
 EXPORT_SYMBOL(notify_restore);
@@ -895,10 +889,8 @@ void notify_disable_event(u16 proc_id, u16 line_id, u32 event_id)
 			(unsigned long *) &notify_state.local_enable_mask);
 	}
 exit:
-	if (status < 0) {
-		printk(KERN_ERR "notify_disable_event failed! status = 0x%x",
-			status);
-	}
+	if (status < 0)
+		pr_err("notify_disable_event failed! status = 0x%x", status);
 	return;
 }
 EXPORT_SYMBOL(notify_disable_event);
@@ -962,10 +954,8 @@ void notify_enable_event(u16 proc_id, u16 line_id, u32 event_id)
 			(unsigned long *)&notify_state.local_enable_mask);
 	}
 exit:
-	if (status < 0) {
-		printk(KERN_ERR "notify_enable_event failed! status = 0x%x",
-			status);
-	}
+	if (status < 0)
+		pr_err("notify_enable_event failed! status = 0x%x", status);
 	return;
 }
 EXPORT_SYMBOL(notify_enable_event);
@@ -997,10 +987,8 @@ bool notify_is_registered(u16 proc_id, u16 line_id)
 		is_registered = true;
 
 exit:
-	if (status < 0) {
-		printk(KERN_ERR "notify_is_registered failed! status = 0x%x",
-			status);
-	}
+	if (status < 0)
+		pr_err("notify_is_registered failed! status = 0x%x", status);
 	return is_registered;
 }
 EXPORT_SYMBOL(notify_is_registered);
@@ -1064,7 +1052,7 @@ void notify_exec(struct notify_object *obj, u32 event_id, u32 payload)
 	WARN_ON(obj == NULL);
 	if (WARN_ON((event_id >= notify_state.cfg.num_events) ||
 		(event_id >= NOTIFY_MAXEVENTS))) {
-		printk(KERN_ERR "Invalid event_id %d\n", event_id);
+		pr_err("Invalid event_id %d\n", event_id);
 	} else {
 		callback = &(obj->callbacks[event_id]);
 		WARN_ON(callback->fn_notify_cbck == NULL);
diff --git a/drivers/dsp/syslink/omap_notify/notify_driver.c b/drivers/dsp/syslink/omap_notify/notify_driver.c
index 2de9ae90d49..c6c399605dd 100644
--- a/drivers/dsp/syslink/omap_notify/notify_driver.c
+++ b/drivers/dsp/syslink/omap_notify/notify_driver.c
@@ -178,7 +178,7 @@ struct notify_driver_object *notify_get_driver_handle(u16 remote_proc_id,
 
 exit:
 	if (status < 0) {
-		printk(KERN_ERR "notify_get_driver_handle failed! "
+		pr_err("notify_get_driver_handle failed! "
 			"status = 0x%x\n", status);
 	}
 	return handle;
diff --git a/drivers/dsp/syslink/omap_notify/plat/omap4_notify_setup.c b/drivers/dsp/syslink/omap_notify/plat/omap4_notify_setup.c
index 016ffb2fad9..f62d0ad5884 100644
--- a/drivers/dsp/syslink/omap_notify/plat/omap4_notify_setup.c
+++ b/drivers/dsp/syslink/omap_notify/plat/omap4_notify_setup.c
@@ -73,7 +73,7 @@ int notify_setup_omap4_attach(u16 proc_id, void *shared_addr)
 							&notify_shm_params);
 	if (notify_setup_driver_handles[proc_id] == NULL) {
 		status = NOTIFY_E_FAIL;
-		printk(KERN_ERR "notify_setup_omap4_attach: "
+		pr_err("notify_setup_omap4_attach: "
 			"notify_ducatidrv_create failed! status = 0x%x",
 			status);
 		goto exit;
@@ -84,14 +84,14 @@ int notify_setup_omap4_attach(u16 proc_id, void *shared_addr)
 					proc_id, 0u, NULL);
 	if (notify_setup_notify_handles[proc_id] == NULL) {
 		status = NOTIFY_E_FAIL;
-		printk(KERN_ERR "notify_setup_omap4_attach: notify_create "
+		pr_err("notify_setup_omap4_attach: notify_create "
 			"failed!");
 		goto exit;
 	}
 
 exit:
 	if (status < 0) {
-		printk(KERN_ERR "notify_setup_omap4_attach failed! "
+		pr_err("notify_setup_omap4_attach failed! "
 			"status = 0x%x", status);
 	}
 	return status;
@@ -113,7 +113,7 @@ int notify_setup_omap4_detach(u16 proc_id)
 	/* Delete the notify driver to the M3 (Line 0) */
 	status = notify_delete(&(notify_setup_notify_handles[proc_id]));
 	if (status < 0) {
-		printk(KERN_ERR "notify_setup_omap4_detach: notify_delete "
+		pr_err("notify_setup_omap4_detach: notify_delete "
 			"failed for line 0!");
 	}
 
@@ -121,13 +121,13 @@ int notify_setup_omap4_detach(u16 proc_id)
 				&(notify_setup_driver_handles[proc_id]));
 	if ((tmp_status < 0) && (status >= 0)) {
 		status = tmp_status;
-		printk(KERN_ERR "notify_setup_omap4_detach: "
+		pr_err("notify_setup_omap4_detach: "
 			"notify_ducatidrv_delete failed for line 0!");
 	}
 
 exit:
 	if (status < 0) {
-		printk(KERN_ERR "notify_setup_omap4_detach failed! "
+		pr_err("notify_setup_omap4_detach failed! "
 			"status = 0x%x", status);
 	}
 	return status;
@@ -153,7 +153,7 @@ uint notify_setup_omap4_shared_mem_req(u16 remote_proc_id, void *shared_addr)
 
 exit:
 	if (status < 0) {
-		printk(KERN_ERR "notify_setup_omap4_shared_mem_req failed!"
+		pr_err("notify_setup_omap4_shared_mem_req failed!"
 			" status = 0x%x", status);
 	}
 	return mem_req;
diff --git a/drivers/dsp/syslink/procmgr/proc4430/proc4430.c b/drivers/dsp/syslink/procmgr/proc4430/proc4430.c
index 44c66c6a444..9f0bdfe2183 100644
--- a/drivers/dsp/syslink/procmgr/proc4430/proc4430.c
+++ b/drivers/dsp/syslink/procmgr/proc4430/proc4430.c
@@ -231,13 +231,12 @@ void proc4430_params_init(void *handle, struct proc4430_params *params)
 					OMAP4430PROC_MAKE_MAGICSTAMP(0),
 					OMAP4430PROC_MAKE_MAGICSTAMP(1))
 					== true) {
-		printk(KERN_ERR "proc4430_params_init failed "
-			"Module not initialized");
+		pr_err("proc4430_params_init failed - Module not initialized");
 		return;
 	}
 
 	if (WARN_ON(params == NULL)) {
-		printk(KERN_ERR "proc4430_params_init failed "
+		pr_err("proc4430_params_init failed "
 			"Argument of type proc4430_params * "
 			"is NULL");
 		return;
@@ -268,8 +267,7 @@ void *proc4430_create(u16 proc_id, const struct proc4430_params *params)
 					OMAP4430PROC_MAKE_MAGICSTAMP(0),
 					OMAP4430PROC_MAKE_MAGICSTAMP(1))
 					== true) {
-		printk(KERN_ERR "proc4430_create failed "
-			"Module not initialized");
+		pr_err("proc4430_create failed - Module not initialized");
 		goto error;
 	}
 
@@ -345,8 +343,7 @@ int proc4430_delete(void **handle_ptr)
 					OMAP4430PROC_MAKE_MAGICSTAMP(0),
 					OMAP4430PROC_MAKE_MAGICSTAMP(1))
 					== true) {
-		printk(KERN_ERR "proc4430_delete failed "
-			"Module not initialized");
+		pr_err("proc4430_delete failed Module not initialized");
 		return -ENODEV;
 	}
 
@@ -391,8 +388,7 @@ int proc4430_open(void **handle_ptr, u16 proc_id)
 					OMAP4430PROC_MAKE_MAGICSTAMP(0),
 					OMAP4430PROC_MAKE_MAGICSTAMP(1))
 					== true) {
-		printk(KERN_ERR "proc4430_open failed "
-			"Module not initialized");
+		pr_err("proc4430_open failed Module not initialized");
 		return -ENODEV;
 	}
 
@@ -424,8 +420,7 @@ int proc4430_close(void *handle)
 					OMAP4430PROC_MAKE_MAGICSTAMP(0),
 					OMAP4430PROC_MAKE_MAGICSTAMP(1))
 					== true) {
-		printk(KERN_ERR "proc4430_close failed "
-			"Module not initialized");
+		pr_err("proc4430_close failed Module not initialized");
 		return -ENODEV;
 	}
 
@@ -456,19 +451,17 @@ int proc4430_attach(void *handle, struct processor_attach_params *params)
 					OMAP4430PROC_MAKE_MAGICSTAMP(0),
 					OMAP4430PROC_MAKE_MAGICSTAMP(1))
 					== true) {
-		printk(KERN_ERR "proc4430_attach failed"
-			"Module not initialized");
+		pr_err("proc4430_attach failed Module not initialized");
 		return -ENODEV;
 	}
 
 	if (WARN_ON(handle == NULL)) {
-		printk(KERN_ERR "proc4430_attach failed"
-			"Driver handle is NULL");
+		pr_err("proc4430_attach failed Driver handle is NULL");
 		return -EINVAL;
 	}
 
 	if (WARN_ON(params == NULL)) {
-		printk(KERN_ERR "proc4430_attach failed"
+		pr_err("proc4430_attach failed"
 			"Argument processor_attach_params * is NULL");
 		return -EINVAL;
 	}
@@ -482,7 +475,7 @@ int proc4430_attach(void *handle, struct processor_attach_params *params)
 				OMAP4430PROC_MAKE_MAGICSTAMP(0));
 	atomic_inc_return(&object->attach_count);
 
-	printk(KERN_ERR "proc4430_attach num_mem_entries = %d",
+	pr_err("proc4430_attach num_mem_entries = %d",
 				object->params.num_mem_entries);
 	/* Return memory information in params. */
 	for (i = 0; (i < object->params.num_mem_entries); i++) {
@@ -497,7 +490,7 @@ int proc4430_attach(void *handle, struct processor_attach_params *params)
 			map_info.is_cached = false;
 			retval = platform_mem_map(&map_info);
 			if (retval != 0) {
-				printk(KERN_ERR "proc4430_attach failed\n");
+				pr_err("proc4430_attach failed\n");
 				return -EFAULT;
 			}
 			map_count++;
@@ -540,12 +533,11 @@ int proc4430_detach(void *handle)
 					OMAP4430PROC_MAKE_MAGICSTAMP(1))
 					== true) {
 
-		printk(KERN_ERR "proc4430_detach failed "
-			"Module not initialized");
+		pr_err("proc4430_detach failed Module not initialized");
 		return -ENODEV;
 	}
 	if (WARN_ON(handle == NULL)) {
-		printk(KERN_ERR "proc4430_detach failed "
+		pr_err("proc4430_detach failed "
 			"Argument Driverhandle is NULL");
 		return -EINVAL;
 	}
@@ -586,8 +578,7 @@ int proc4430_read(void *handle, u32 proc_addr, u32 *num_bytes,
 					OMAP4430PROC_MAKE_MAGICSTAMP(0),
 					OMAP4430PROC_MAKE_MAGICSTAMP(1))
 					== true) {
-		printk(KERN_ERR "proc4430_read failed "
-			"Module not initialized");
+		pr_err("proc4430_read failed Module not initialized");
 		return -ENODEV;
 	}
 
@@ -613,8 +604,7 @@ int proc4430_write(void *handle, u32 proc_addr, u32 *num_bytes,
 					OMAP4430PROC_MAKE_MAGICSTAMP(0),
 					OMAP4430PROC_MAKE_MAGICSTAMP(1))
 					== true) {
-		printk(KERN_ERR "proc4430_write failed "
-			"Module not initialized");
+		pr_err("proc4430_write failed Module not initialized");
 		return -ENODEV;
 	}
 
@@ -644,18 +634,17 @@ int proc4430_control(void *handle, int cmd, void *arg)
 		retval = ipu_pm_notifications(cmd, NULL);
 		break;
 	default:
-		printk(KERN_ERR "Invalid notification\n");
+		pr_err("Invalid notification\n");
 	}
 	if (retval != PM_SUCCESS)
-		printk(KERN_ERR "Error in notifications\n");
+		pr_err("Error in notifications\n");
 #endif
 
 	if (atomic_cmpmask_and_lt(&proc4430_state.ref_count,
 					OMAP4430PROC_MAKE_MAGICSTAMP(0),
 					OMAP4430PROC_MAKE_MAGICSTAMP(1))
 					== true) {
-		printk(KERN_ERR "proc4430_control failed "
-			"Module not initialized");
+		pr_err("proc4430_control failed Module not initialized");
 		return -ENODEV;
 	}
 
@@ -685,8 +674,7 @@ int proc4430_translate_addr(void *handle,
 					OMAP4430PROC_MAKE_MAGICSTAMP(0),
 					OMAP4430PROC_MAKE_MAGICSTAMP(1))
 					== true) {
-		printk(KERN_ERR "proc4430_translate_addr failed "
-			"Module not initialized");
+		pr_err("proc4430_translate_addr failed Module not initialized");
 		retval = -ENODEV;
 		goto error_exit;
 	}
@@ -764,8 +752,7 @@ int proc4430_virt_to_phys(void *handle, u32 da, u32 *mapped_entries,
 					OMAP4430PROC_MAKE_MAGICSTAMP(0),
 					OMAP4430PROC_MAKE_MAGICSTAMP(1))
 					== true) {
-		printk(KERN_ERR "proc4430_virt_to_phys failed "
-			"Module not initialized");
+		pr_err("proc4430_virt_to_phys failed Module not initialized");
 		ret_val = -EFAULT;
 		goto error_exit;
 	}
@@ -782,7 +769,7 @@ int proc4430_virt_to_phys(void *handle, u32 da, u32 *mapped_entries,
 	return 0;
 
 error_exit:
-	printk(KERN_WARNING "proc4430_virtToPhys failed !!!!\n");
+	pr_warn("proc4430_virtToPhys failed !!!!\n");
 	return ret_val;
 }
 
@@ -802,8 +789,7 @@ int proc4430_proc_info(void *handle, struct proc_mgr_proc_info *procinfo)
 					OMAP4430PROC_MAKE_MAGICSTAMP(0),
 					OMAP4430PROC_MAKE_MAGICSTAMP(1))
 					== true) {
-		printk(KERN_ERR "proc4430_proc_info failed "
-			"Module not initialized");
+		pr_err("proc4430_proc_info failed Module not initialized");
 		goto error_exit;
 	}
 
@@ -829,6 +815,6 @@ int proc4430_proc_info(void *handle, struct proc_mgr_proc_info *procinfo)
 	return 0;
 
 error_exit:
-	printk(KERN_WARNING "proc4430_proc_info failed !!!!\n");
+	pr_warn("proc4430_proc_info failed !!!!\n");
 	return -EFAULT;
 }
diff --git a/drivers/dsp/syslink/procmgr/proc4430/proc4430_drv.c b/drivers/dsp/syslink/procmgr/proc4430/proc4430_drv.c
index f7d75db0e6d..5564c3f05b2 100644
--- a/drivers/dsp/syslink/procmgr/proc4430/proc4430_drv.c
+++ b/drivers/dsp/syslink/procmgr/proc4430/proc4430_drv.c
@@ -311,7 +311,7 @@ static int proc4430_drv_ioctl(struct inode *inode, struct file *filp,
 
 	default:
 	{
-		printk(KERN_ERR "unsupported ioctl\n");
+		pr_err("unsupported ioctl\n");
 	}
 	break;
 	}
@@ -358,7 +358,7 @@ static int __init proc4430_drv_initializeModule(void)
 	int retval;
 
 	/* Display the version info and created date/time */
-	printk(KERN_INFO "proc4430_drv_initializeModule\n");
+	pr_info("proc4430_drv_initializeModule\n");
 
 	if (driver_major) {
 		dev = MKDEV(driver_major, driver_minor);
@@ -383,7 +383,7 @@ static int __init proc4430_drv_initializeModule(void)
 	retval = cdev_add(&proc_4430_device->cdev, dev, 1);
 
 	if (retval) {
-		printk(KERN_ERR "Failed to add the syslink proc_4430 device\n");
+		pr_err("Failed to add the syslink proc_4430 device\n");
 		goto exit;
 	}
 
@@ -391,7 +391,7 @@ static int __init proc4430_drv_initializeModule(void)
 	proc_4430_class = class_create(THIS_MODULE, "syslink-proc4430");
 
 	if (IS_ERR(proc_4430_class)) {
-		printk(KERN_ERR "Error creating bridge class\n");
+		pr_err("Error creating bridge class\n");
 		goto exit;
 	}
 	device_create(proc_4430_class, NULL, MKDEV(driver_major, driver_minor),
diff --git a/drivers/dsp/syslink/procmgr/procmgr.c b/drivers/dsp/syslink/procmgr/procmgr.c
index b0ce1d1dc3d..187f100b4a4 100644
--- a/drivers/dsp/syslink/procmgr/procmgr.c
+++ b/drivers/dsp/syslink/procmgr/procmgr.c
@@ -172,7 +172,7 @@ int proc_mgr_destroy(void)
 	if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count),
 		PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1))
 		 == true) {
-		printk(KERN_ERR "proc_mgr_destroy: Error - module not initialized\n");
+		pr_err("proc_mgr_destroy: Error - module not initialized\n");
 		return -EFAULT;
 	}
 	if (atomic_dec_return(&proc_mgr_obj_state.ref_count)
@@ -213,7 +213,7 @@ void proc_mgr_params_init(void *handle, struct proc_mgr_params *params)
 	if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count),
 		PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1))
 		 == true) {
-		printk(KERN_ERR "proc_mgr_params_init: Error - module not initialized\n");
+		pr_err("proc_mgr_params_init: Error - module not initialized\n");
 	}
 	if (handle == NULL) {
 		memcpy(params, &(proc_mgr_obj_state.def_inst_params),
@@ -256,12 +256,12 @@ void *proc_mgr_create(u16 proc_id, const struct proc_mgr_params *params)
 	if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count),
 		PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1))
 		 == true) {
-		printk(KERN_ERR "proc_mgr_create: Error - module not initialized\n");
+		pr_err("proc_mgr_create: Error - module not initialized\n");
 		return NULL;
 	}
 	if (proc_mgr_obj_state.proc_handles[proc_id] != NULL) {
 		handle = proc_mgr_obj_state.proc_handles[proc_id];
-		printk(KERN_WARNING "proc_mgr_create:"
+		pr_warn("proc_mgr_create:"
 			"Processor already exists for specified"
 			"%d  proc_id, handle = 0x%x\n", proc_id, (u32)handle);
 		return handle;
@@ -300,7 +300,7 @@ proc_mgr_delete(void **handle_ptr)
 	if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count),
 		PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1))
 		 == true) {
-		printk(KERN_ERR "proc_mgr_delete: Error - module not initialized\n");
+		pr_err("proc_mgr_delete: Error - module not initialized\n");
 		return -EFAULT;
 	}
 
@@ -331,7 +331,7 @@ int proc_mgr_open(void **handle_ptr, u16 proc_id)
 	if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count),
 		PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1))
 		 == true) {
-		printk(KERN_ERR "proc_mgr_open: Error - module not initialized\n");
+		pr_err("proc_mgr_open: Error - module not initialized\n");
 		return -EFAULT;
 	}
 
@@ -356,7 +356,7 @@ int proc_mgr_close(void *handle)
 	if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count),
 		PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1))
 		 == true) {
-		printk(KERN_ERR "proc_mgr_close: Error - module not initialized\n");
+		pr_err("proc_mgr_close: Error - module not initialized\n");
 		return -EFAULT;
 	}
 	/* Nothing to be done for closing the handle. */
@@ -383,7 +383,7 @@ void proc_mgr_get_attach_params(void *handle,
 	if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count),
 		PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1))
 		 == true) {
-		printk(KERN_ERR "proc_mgr_get_attach_params:"
+		pr_err("proc_mgr_get_attach_params:"
 			"Error - module not initialized\n");
 	}
 	if (handle == NULL) {
@@ -435,8 +435,7 @@ int proc_mgr_attach(void *handle, struct proc_mgr_attach_params *params)
 	if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count),
 		PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1))
 		 == true) {
-		printk(KERN_ERR "proc_mgr_attach:"
-			"Error - module not initialized\n");
+		pr_err("proc_mgr_attach: Error - module not initialized\n");
 		return -EFAULT;
 	}
 	if (WARN_ON(handle == NULL)) {
@@ -457,7 +456,7 @@ int proc_mgr_attach(void *handle, struct proc_mgr_attach_params *params)
 	retval = processor_attach(proc_mgr_handle->proc_handle,
 					&proc_attach_params);
 	proc_mgr_handle->num_mem_entries = proc_attach_params.num_mem_entries;
-	printk(KERN_INFO "proc_mgr_attach:proc_mgr_handle->num_mem_entries = %d\n",
+	pr_info("proc_mgr_attach:proc_mgr_handle->num_mem_entries = %d\n",
 			proc_mgr_handle->num_mem_entries);
 	/* Store memory information in local object.*/
 	memcpy(&(proc_mgr_handle->mem_entries),
@@ -490,8 +489,7 @@ int proc_mgr_detach(void *handle)
 	if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count),
 		PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1))
 		 == true) {
-		printk(KERN_ERR "proc_mgr_detach:"
-			"Error - module not initialized\n");
+		pr_err("proc_mgr_detach: Error - module not initialized\n");
 		return -EFAULT;
 	}
 	BUG_ON(handle == NULL);
@@ -520,8 +518,7 @@ enum proc_mgr_state proc_mgr_get_state(void *handle)
 	if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count),
 		PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1))
 		 == true) {
-		printk(KERN_ERR "proc_mgr_get_state:"
-			"Error - module not initialized\n");
+		pr_err("proc_mgr_get_state: Error - module not initialized\n");
 		return -EFAULT;
 	}
 	BUG_ON(handle == NULL);
@@ -552,8 +549,7 @@ int proc_mgr_read(void *handle, u32 proc_addr, u32 *num_bytes, void *buffer)
 	if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count),
 		PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1))
 		 == true) {
-		printk(KERN_ERR "proc_mgr_read:"
-			"Error - module not initialized\n");
+		pr_err("proc_mgr_read: Error - module not initialized\n");
 		return -EFAULT;
 	}
 	BUG_ON(handle == NULL);
@@ -603,8 +599,7 @@ int proc_mgr_write(void *handle, u32 proc_addr, u32 *num_bytes, void *buffer)
 	if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count),
 		PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1))
 		 == true) {
-		printk(KERN_ERR "proc_mgr_write:"
-			"Error - module not initialized\n");
+		pr_err("proc_mgr_write: Error - module not initialized\n");
 		return -EFAULT;
 	}
 	BUG_ON(proc_addr == 0);
@@ -637,8 +632,7 @@ int proc_mgr_control(void *handle, int cmd, void *arg)
 	if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count),
 		PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1))
 		 == true) {
-		printk(KERN_ERR "proc_mgr_control:"
-			"Error - module not initialized\n");
+		pr_err("proc_mgr_control: Error - module not initialized\n");
 		return -EFAULT;
 	}
 	BUG_ON(handle == NULL);
@@ -669,7 +663,7 @@ int proc_mgr_translate_addr(void *handle, void **dst_addr,
 	if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count),
 		PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1))
 		 == true) {
-		printk(KERN_ERR "proc_mgr_translate_addr:"
+		pr_err("proc_mgr_translate_addr:"
 			"Error - module not initialized\n");
 		return -EFAULT;
 	}
@@ -706,7 +700,7 @@ int proc_mgr_register_notify(void *handle, proc_mgr_callback_fxn fxn,
 	if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count),
 		PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1))
 		 == true) {
-		printk(KERN_ERR "proc_mgr_register_notify:"
+		pr_err("proc_mgr_register_notify:"
 			"Error - module not initialized\n");
 		return -EFAULT;
 	}
@@ -736,7 +730,7 @@ int proc_mgr_get_proc_info(void *handle, struct proc_mgr_proc_info *proc_info)
 	if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count),
 		PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1))
 		 == true) {
-		printk(KERN_ERR "proc_mgr_get_proc_info:"
+		pr_err("proc_mgr_get_proc_info:"
 			"Error - module not initialized\n");
 		return -EFAULT;
 	}
diff --git a/drivers/dsp/syslink/procmgr/procmgr_drv.c b/drivers/dsp/syslink/procmgr/procmgr_drv.c
index 6bb6e7ab594..fb8159fd4d4 100644
--- a/drivers/dsp/syslink/procmgr/procmgr_drv.c
+++ b/drivers/dsp/syslink/procmgr/procmgr_drv.c
@@ -145,7 +145,7 @@ static int proc_mgr_drv_release(struct inode *inode, struct file *filp)
 	pr_ctxt = filp->private_data;
 	while (pr_ctxt->setup_count-- > 0) {
 		/* Destroy has not been called.  Call destroy now. */
-		printk(KERN_ERR "proc_mgr_drv_release: "
+		pr_err("proc_mgr_drv_release: "
 			"proc_mgr_destroy %d\n", pr_ctxt->setup_count);
 		proc_mgr_destroy();
 	}
@@ -577,7 +577,7 @@ static int proc_mgr_drv_ioctl(struct inode *inode, struct file *filp,
 	}
 	break;
 	default:
-		printk(KERN_ERR"PROC_MGR_DRV: WRONG IOCTL !!!!\n");
+		pr_err("PROC_MGR_DRV: WRONG IOCTL !!!!\n");
 		BUG_ON(1);
 	break;
 	}
@@ -641,7 +641,7 @@ static int __devinit proc_mgr_probe(struct platform_device *pdev)
 	retval = cdev_add(&procmgr_device->cdev, dev, 1);
 
 	if (retval) {
-		printk(KERN_ERR "Failed to add the syslink procmgr device\n");
+		pr_err("Failed to add the syslink procmgr device\n");
 		goto exit;
 	}
 
@@ -649,7 +649,7 @@ static int __devinit proc_mgr_probe(struct platform_device *pdev)
 	proc_mgr_class = class_create(THIS_MODULE, "syslink-procmgr");
 
 	if (IS_ERR(proc_mgr_class)) {
-		printk(KERN_ERR "Error creating bridge class\n");
+		pr_err("Error creating bridge class\n");
 		goto exit;
 	}
 	device_create(proc_mgr_class, NULL, MKDEV(driver_major, driver_minor),
@@ -691,7 +691,7 @@ static int __init proc_mgr_drv_initialize_module(void)
 
 	procmgr_pdev = platform_device_alloc(PROCMGR_NAME, -1);
 	if (!procmgr_pdev) {
-		printk(KERN_ERR "%s:device allocation failed\n", __func__);
+		pr_err("%s:device allocation failed\n", __func__);
 		return -ENOMEM;
 	}
 	retval = platform_device_add(procmgr_pdev);