aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHari Kanigeri <h-kanigeri2@ti.com>2010-11-03 11:04:45 -0400
committerPaolo Pisati <paolo.pisati@canonical.com>2012-08-17 04:19:08 -0400
commitfe8a6994da3f443b8c7e19fc4d2ad327a36b6438 (patch)
tree39bb516d749b917bcb434ac221dacba8d9bc55f5
parent03cda670ebdd78edc449bd049341822605a0ab0f (diff)
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>
Diffstat
-rw-r--r--drivers/dsp/syslink/multicore_ipc/gatehwspinlock.c30
-rw-r--r--drivers/dsp/syslink/multicore_ipc/gatemp.c38
-rw-r--r--drivers/dsp/syslink/multicore_ipc/gatepeterson.c27
-rw-r--r--drivers/dsp/syslink/multicore_ipc/heapbufmp.c40
-rw-r--r--drivers/dsp/syslink/multicore_ipc/heapmemmp.c40
-rw-r--r--drivers/dsp/syslink/multicore_ipc/ipc.c113
-rw-r--r--drivers/dsp/syslink/multicore_ipc/ipc_drv.c11
-rw-r--r--drivers/dsp/syslink/multicore_ipc/listmp.c98
-rw-r--r--drivers/dsp/syslink/multicore_ipc/listmp_ioctl.c2
-rw-r--r--drivers/dsp/syslink/multicore_ipc/messageq.c137
-rw-r--r--drivers/dsp/syslink/multicore_ipc/messageq_ioctl.c2
-rw-r--r--drivers/dsp/syslink/multicore_ipc/nameserver.c62
-rw-r--r--drivers/dsp/syslink/multicore_ipc/nameserver_remote.c6
-rw-r--r--drivers/dsp/syslink/multicore_ipc/nameserver_remotenotify.c22
-rw-r--r--drivers/dsp/syslink/multicore_ipc/platform.c163
-rw-r--r--drivers/dsp/syslink/multicore_ipc/sharedregion.c102
-rw-r--r--drivers/dsp/syslink/multicore_ipc/sharedregion_ioctl.c14
-rw-r--r--drivers/dsp/syslink/multicore_ipc/sysmemmgr.c21
-rw-r--r--drivers/dsp/syslink/multicore_ipc/sysmgr.c98
-rw-r--r--drivers/dsp/syslink/multicore_ipc/transportshm.c54
-rw-r--r--drivers/dsp/syslink/multicore_ipc/transportshm_setup.c6
-rw-r--r--drivers/dsp/syslink/notify_ducatidriver/notify_ducati.c37
-rw-r--r--drivers/dsp/syslink/omap_notify/drv_notify.c14
-rw-r--r--drivers/dsp/syslink/omap_notify/notify.c56
-rw-r--r--drivers/dsp/syslink/omap_notify/notify_driver.c2
-rw-r--r--drivers/dsp/syslink/omap_notify/plat/omap4_notify_setup.c14
-rw-r--r--drivers/dsp/syslink/procmgr/proc4430/proc4430.c60
-rw-r--r--drivers/dsp/syslink/procmgr/proc4430/proc4430_drv.c8
-rw-r--r--drivers/dsp/syslink/procmgr/procmgr.c42
-rw-r--r--drivers/dsp/syslink/procmgr/procmgr_drv.c10
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)
183 lock_handle = hwspinlock_request_specific(i); 183 lock_handle = hwspinlock_request_specific(i);
184 if (lock_handle == NULL) { 184 if (lock_handle == NULL) {
185 retval = -EBUSY; 185 retval = -EBUSY;
186 printk(KERN_ERR "hwspinlock_request failed for" 186 pr_err("hwspinlock_request failed for"
187 "id = %d", i); 187 "id = %d", i);
188 goto spinlock_request_fail; 188 goto spinlock_request_fail;
189 } 189 }
@@ -200,8 +200,7 @@ exit:
200 kfree(gatehwspinlock_module->hw_lock_handles); 200 kfree(gatehwspinlock_module->hw_lock_handles);
201 atomic_dec_return(&gatehwspinlock_module->ref_count); 201 atomic_dec_return(&gatehwspinlock_module->ref_count);
202 if (retval < 0) 202 if (retval < 0)
203 printk(KERN_ERR "gatehwspinlock_setup failed! status = 0x%x", 203 pr_err("gatehwspinlock_setup failed! status = 0x%x", retval);
204 retval);
205 return retval; 204 return retval;
206} 205}
207EXPORT_SYMBOL(gatehwspinlock_setup); 206EXPORT_SYMBOL(gatehwspinlock_setup);
@@ -240,8 +239,7 @@ int gatehwspinlock_destroy(void)
240 lock_handle = gatehwspinlock_module->hw_lock_handles[i]; 239 lock_handle = gatehwspinlock_module->hw_lock_handles[i];
241 retval = hwspinlock_free(lock_handle); 240 retval = hwspinlock_free(lock_handle);
242 if (retval < 0) 241 if (retval < 0)
243 printk(KERN_ERR "hwspinlock_free failed for" 242 pr_err("hwspinlock_free failed for id = %d", i);
244 "id = %d", i);
245 gatehwspinlock_module->hw_lock_handles[i] = NULL; 243 gatehwspinlock_module->hw_lock_handles[i] = NULL;
246 } 244 }
247 memset(&gatehwspinlock_module->cfg, 0, 245 memset(&gatehwspinlock_module->cfg, 0,
@@ -251,12 +249,9 @@ int gatehwspinlock_destroy(void)
251 return 0; 249 return 0;
252 250
253exit: 251exit:
254 if (retval < 0) { 252 if (retval < 0)
255 printk(KERN_ERR "gatehwspinlock_destroy failed status:%x\n", 253 pr_err("gatehwspinlock_destroy failed status:%x\n", retval);
256 retval);
257 }
258 return retval; 254 return retval;
259
260} 255}
261EXPORT_SYMBOL(gatehwspinlock_destroy); 256EXPORT_SYMBOL(gatehwspinlock_destroy);
262 257
@@ -375,7 +370,7 @@ void *gatehwspinlock_create(enum igatempsupport_local_protect local_protect,
375 gatehwspinlock_module->hw_lock_handles[params->resource_id]; 370 gatehwspinlock_module->hw_lock_handles[params->resource_id];
376 if (obj->hwhandle == NULL) { 371 if (obj->hwhandle == NULL) {
377 retval = -EBUSY; 372 retval = -EBUSY;
378 printk(KERN_ERR "hwspinlock_request failed for id = %d", 373 pr_err("hwspinlock_request failed for id = %d",
379 params->resource_id); 374 params->resource_id);
380 goto free_obj; 375 goto free_obj;
381 } 376 }
@@ -385,7 +380,7 @@ void *gatehwspinlock_create(enum igatempsupport_local_protect local_protect,
385free_obj: 380free_obj:
386 kfree(obj); 381 kfree(obj);
387exit: 382exit:
388 printk(KERN_ERR "gatehwspinlock_create failed status: %x\n", retval); 383 pr_err("gatehwspinlock_create failed status: %x\n", retval);
389 return NULL; 384 return NULL;
390} 385}
391EXPORT_SYMBOL(gatehwspinlock_create); 386EXPORT_SYMBOL(gatehwspinlock_create);
@@ -427,7 +422,7 @@ int gatehwspinlock_delete(void **gphandle)
427 return 0; 422 return 0;
428 423
429exit: 424exit:
430 printk(KERN_ERR "gatehwspinlock_delete failed status: %x\n", retval); 425 pr_err("gatehwspinlock_delete failed status: %x\n", retval);
431 return retval; 426 return retval;
432} 427}
433EXPORT_SYMBOL(gatehwspinlock_delete); 428EXPORT_SYMBOL(gatehwspinlock_delete);
@@ -480,8 +475,7 @@ int *gatehwspinlock_enter(void *gphandle)
480 475
481exit: 476exit:
482 if (retval < 0) 477 if (retval < 0)
483 printk(KERN_ERR "gatehwspinlock_enter failed! status = 0x%x", 478 pr_err("gatehwspinlock_enter failed! status = 0x%x", retval);
484 retval);
485 return key; 479 return key;
486} 480}
487EXPORT_SYMBOL(gatehwspinlock_enter); 481EXPORT_SYMBOL(gatehwspinlock_enter);
@@ -522,8 +516,7 @@ void gatehwspinlock_leave(void *gphandle, int *key)
522 516
523exit: 517exit:
524 if (retval < 0) 518 if (retval < 0)
525 printk(KERN_ERR "gatehwspinlock_leave failed! status = 0x%x", 519 pr_err("gatehwspinlock_leave failed! status = 0x%x", retval);
526 retval);
527 return; 520 return;
528} 521}
529EXPORT_SYMBOL(gatehwspinlock_leave); 522EXPORT_SYMBOL(gatehwspinlock_leave);
@@ -552,8 +545,7 @@ static u32 gatehwspinlock_get_resource_id(void *handle)
552 return obj->lock_num; 545 return obj->lock_num;
553 546
554exit: 547exit:
555 printk(KERN_ERR "gatehwspinlock_get_resource_id failed status: %x\n", 548 pr_err("gatehwspinlock_get_resource_id failed status: %x\n", retval);
556 retval);
557 return (u32)-1; 549 return (u32)-1;
558} 550}
559EXPORT_SYMBOL(gatehwspinlock_get_resource_id); 551EXPORT_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)
238 238
239exit: 239exit:
240 if (retval < 0) 240 if (retval < 0)
241 printk(KERN_ERR "gatemp_get_config failed! status = 0x%x", 241 pr_err("gatemp_get_config failed! status = 0x%x", retval);
242 retval);
243 return; 242 return;
244} 243}
245 244
@@ -418,7 +417,7 @@ error_nameserver:
418 kfree(gatemp_module->gate_mutex); 417 kfree(gatemp_module->gate_mutex);
419 gatemp_module->gate_mutex = NULL; 418 gatemp_module->gate_mutex = NULL;
420exit: 419exit:
421 printk(KERN_ERR "gatemp_setup failed! status = 0x%x", retval); 420 pr_err("gatemp_setup failed! status = 0x%x", retval);
422 return retval; 421 return retval;
423} 422}
424 423
@@ -476,7 +475,7 @@ s32 gatemp_destroy(void)
476 475
477exit: 476exit:
478 if (retval < 0) 477 if (retval < 0)
479 printk(KERN_ERR "gatemp_destroy failed! status = 0x%x", retval); 478 pr_err("gatemp_destroy failed! status = 0x%x", retval);
480 return retval; 479 return retval;
481} 480}
482 481
@@ -851,8 +850,7 @@ proxy_work:
851 } 850 }
852 851
853 if (retval != 0) { 852 if (retval != 0) {
854 printk(KERN_ERR "gatemp_instance_init failed! status = 0x%x", 853 pr_err("gatemp_instance_init failed! status = 0x%x", retval);
855 retval);
856 } 854 }
857 return retval; 855 return retval;
858} 856}
@@ -971,7 +969,7 @@ static void gatemp_instance_finalize(struct gatemp_object *obj, int status)
971 969
972exit: 970exit:
973 if (retval < 0) { 971 if (retval < 0) {
974 printk(KERN_ERR "gatemp_instance_finalize failed! " 972 pr_err("gatemp_instance_finalize failed! "
975 "status = 0x%x", retval); 973 "status = 0x%x", retval);
976 } 974 }
977 return; 975 return;
@@ -1049,7 +1047,7 @@ int gatemp_open(char *name, void **handle)
1049 1047
1050exit: 1048exit:
1051 if (retval < 0) 1049 if (retval < 0)
1052 printk(KERN_ERR "gatemp_open failed! status = 0x%x", retval); 1050 pr_err("gatemp_open failed! status = 0x%x", retval);
1053 return retval; 1051 return retval;
1054} 1052}
1055 1053
@@ -1155,10 +1153,8 @@ int gatemp_open_by_addr(void *shared_addr, void **handle)
1155 } 1153 }
1156 1154
1157exit: 1155exit:
1158 if (retval < 0) { 1156 if (retval < 0)
1159 printk(KERN_ERR "gatemp_open_by_addr failed! status = 0x%x", 1157 pr_err("gatemp_open_by_addr failed! status = 0x%x", retval);
1160 retval);
1161 }
1162 return retval; 1158 return retval;
1163} 1159}
1164 1160
@@ -1206,7 +1202,7 @@ int gatemp_close(void **handle)
1206 return 0; 1202 return 0;
1207 1203
1208exit: 1204exit:
1209 printk(KERN_ERR "gatemp_close failed! status = 0x%x", retval); 1205 pr_err("gatemp_close failed! status = 0x%x", retval);
1210 return retval; 1206 return retval;
1211} 1207}
1212 1208
@@ -1449,7 +1445,7 @@ static void gatemp_set_region0_reserved(void *shared_addr)
1449 1445
1450static void gatemp_clear_region0_reserved(void) 1446static void gatemp_clear_region0_reserved(void)
1451{ 1447{
1452 printk(KERN_INFO "gatemp_clear_region0_reserved: either nothing to do " 1448 pr_info("gatemp_clear_region0_reserved: either nothing to do "
1453 "or not implemented"); 1449 "or not implemented");
1454} 1450}
1455 1451
@@ -1516,7 +1512,7 @@ static void gatemp_open_region0_reserved(void *shared_addr)
1516 1512
1517static void gatemp_close_region0_reserved(void *shared_addr) 1513static void gatemp_close_region0_reserved(void *shared_addr)
1518{ 1514{
1519 printk(KERN_INFO "gatemp_close_region0_reserved: either nothing to do " 1515 pr_info("gatemp_close_region0_reserved: either nothing to do "
1520 "or not implemented"); 1516 "or not implemented");
1521} 1517}
1522 1518
@@ -1577,7 +1573,7 @@ int gatemp_start(void *shared_addr)
1577 } 1573 }
1578 1574
1579 if (retval < 0) 1575 if (retval < 0)
1580 printk(KERN_ERR "gatemp_start failed! status = 0x%x", retval); 1576 pr_err("gatemp_start failed! status = 0x%x", retval);
1581 return retval; 1577 return retval;
1582} 1578}
1583 1579
@@ -1683,7 +1679,7 @@ void *gatemp_create(const struct gatemp_params *params)
1683 1679
1684exit: 1680exit:
1685 if (retval < 0) 1681 if (retval < 0)
1686 printk(KERN_ERR "gatemp_create failed! status = 0x%x", retval); 1682 pr_err("gatemp_create failed! status = 0x%x", retval);
1687 return (void *)handle; 1683 return (void *)handle;
1688} 1684}
1689 1685
@@ -1722,7 +1718,7 @@ gatemp_init_fail:
1722 kfree(obj); 1718 kfree(obj);
1723 obj = NULL; 1719 obj = NULL;
1724exit: 1720exit:
1725 printk(KERN_ERR "_gatemp_create failed! status = 0x%x", retval); 1721 pr_err("_gatemp_create failed! status = 0x%x", retval);
1726 return (void *)NULL; 1722 return (void *)NULL;
1727} 1723}
1728 1724
@@ -1776,7 +1772,7 @@ int gatemp_delete(void **handle)
1776 return 0; 1772 return 0;
1777 1773
1778exit: 1774exit:
1779 printk(KERN_ERR "gatemp_delete failed! status = 0x%x", retval); 1775 pr_err("gatemp_delete failed! status = 0x%x", retval);
1780 return retval; 1776 return retval;
1781} 1777}
1782 1778
@@ -1823,7 +1819,7 @@ int gatemp_attach(u16 remote_proc_id, void *shared_addr)
1823 1819
1824exit: 1820exit:
1825 if (retval < 0) 1821 if (retval < 0)
1826 printk(KERN_ERR "gatemp_attach failed! status = 0x%x", retval); 1822 pr_err("gatemp_attach failed! status = 0x%x", retval);
1827 return retval; 1823 return retval;
1828} 1824}
1829 1825
@@ -1857,6 +1853,6 @@ int gatemp_detach(u16 remote_proc_id, void *shared_addr)
1857 1853
1858exit: 1854exit:
1859 if (retval < 0) 1855 if (retval < 0)
1860 printk(KERN_ERR "gatemp_detach failed! status = 0x%x", retval); 1856 pr_err("gatemp_detach failed! status = 0x%x", retval);
1861 return retval; 1857 return retval;
1862} 1858}
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:
209 atomic_set(&gatepeterson_module->ref_count, 209 atomic_set(&gatepeterson_module->ref_count,
210 GATEPETERSON_MAKE_MAGICSTAMP(0)); 210 GATEPETERSON_MAKE_MAGICSTAMP(0));
211 211
212 printk(KERN_ERR "gatepeterson_setup failed status: %x\n", 212 pr_err("gatepeterson_setup failed status: %x\n", retval);
213 retval);
214 return retval; 213 return retval;
215} 214}
216EXPORT_SYMBOL(gatepeterson_setup); 215EXPORT_SYMBOL(gatepeterson_setup);
@@ -272,12 +271,9 @@ int gatepeterson_destroy(void)
272 return 0; 271 return 0;
273 272
274exit: 273exit:
275 if (retval < 0) { 274 if (retval < 0)
276 printk(KERN_ERR "gatepeterson_destroy failed status:%x\n", 275 pr_err("gatepeterson_destroy failed status:%x\n", retval);
277 retval);
278 }
279 return retval; 276 return retval;
280
281} 277}
282EXPORT_SYMBOL(gatepeterson_destroy); 278EXPORT_SYMBOL(gatepeterson_destroy);
283 279
@@ -418,10 +414,8 @@ static int gatepeterson_instance_init(struct gatepeterson_object *obj,
418 } 414 }
419 415
420exit: 416exit:
421 if (retval < 0) { 417 if (retval < 0)
422 printk(KERN_ERR "gatemp_instance_init failed! status = 0x%x", 418 pr_err("gatemp_instance_init failed! status = 0x%x", retval);
423 retval);
424 }
425 return retval; 419 return retval;
426} 420}
427 421
@@ -545,8 +539,7 @@ int gatepeterson_delete(void **gphandle)
545 return 0; 539 return 0;
546 540
547exit: 541exit:
548 printk(KERN_ERR "gatepeterson_delete failed status: %x\n", 542 pr_err("gatepeterson_delete failed status: %x\n", retval);
549 retval);
550 return retval; 543 return retval;
551} 544}
552EXPORT_SYMBOL(gatepeterson_delete); 545EXPORT_SYMBOL(gatepeterson_delete);
@@ -604,7 +597,7 @@ int gatepeterson_open_by_addr(enum igatempsupport_local_protect local_protect,
604 return 0; 597 return 0;
605 598
606exit: 599exit:
607 printk(KERN_ERR "gatepeterson_open failed status: %x\n", retval); 600 pr_err("gatepeterson_open failed status: %x\n", retval);
608 return retval; 601 return retval;
609} 602}
610EXPORT_SYMBOL(gatepeterson_open_by_addr); 603EXPORT_SYMBOL(gatepeterson_open_by_addr);
@@ -668,7 +661,7 @@ error_handle:
668 gatemp_leave(obj->local_gate, key); 661 gatemp_leave(obj->local_gate, key);
669 662
670exit: 663exit:
671 printk(KERN_ERR "gatepeterson_close failed status: %x\n", retval); 664 pr_err("gatepeterson_close failed status: %x\n", retval);
672 return retval; 665 return retval;
673} 666}
674EXPORT_SYMBOL(gatepeterson_close); 667EXPORT_SYMBOL(gatepeterson_close);
@@ -939,10 +932,10 @@ obj_alloc_fail:
939 932
940exit: 933exit:
941 if (create_flag == true) 934 if (create_flag == true)
942 printk(KERN_ERR "_gatepeterson_create (create) failed " 935 pr_err("_gatepeterson_create (create) failed "
943 "status: %x\n", status); 936 "status: %x\n", status);
944 else 937 else
945 printk(KERN_ERR "_gatepeterson_create (open) failed " 938 pr_err("_gatepeterson_create (open) failed "
946 "status: %x\n", status); 939 "status: %x\n", status);
947 940
948 return NULL; 941 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)
161 sizeof(struct heapbufmp_config)); 161 sizeof(struct heapbufmp_config));
162 return 0; 162 return 0;
163error: 163error:
164 printk(KERN_ERR "heapbufmp_get_config failed status: %x\n", retval); 164 pr_err("heapbufmp_get_config failed status: %x\n", retval);
165 return retval; 165 return retval;
166} 166}
167EXPORT_SYMBOL(heapbufmp_get_config); 167EXPORT_SYMBOL(heapbufmp_get_config);
@@ -242,7 +242,7 @@ int heapbufmp_setup(const struct heapbufmp_config *cfg)
242 return 0; 242 return 0;
243 243
244error: 244error:
245 printk(KERN_ERR "heapbufmp_setup failed status: %x\n", retval); 245 pr_err("heapbufmp_setup failed status: %x\n", retval);
246 return retval; 246 return retval;
247} 247}
248EXPORT_SYMBOL(heapbufmp_setup); 248EXPORT_SYMBOL(heapbufmp_setup);
@@ -315,7 +315,7 @@ int heapbufmp_destroy(void)
315 return 0; 315 return 0;
316 316
317error: 317error:
318 printk(KERN_ERR "heapbufmp_destroy failed status: %x\n", retval); 318 pr_err("heapbufmp_destroy failed status: %x\n", retval);
319 return retval; 319 return retval;
320} 320}
321EXPORT_SYMBOL(heapbufmp_destroy); 321EXPORT_SYMBOL(heapbufmp_destroy);
@@ -344,7 +344,7 @@ void heapbufmp_params_init(struct heapbufmp_params *params)
344 344
345 return; 345 return;
346error: 346error:
347 printk(KERN_ERR "heapbufmp_params_init failed status: %x\n", retval); 347 pr_err("heapbufmp_params_init failed status: %x\n", retval);
348} 348}
349EXPORT_SYMBOL(heapbufmp_params_init); 349EXPORT_SYMBOL(heapbufmp_params_init);
350 350
@@ -573,7 +573,7 @@ error:
573 else 573 else
574 heapbufmp_close(handle_ptr); 574 heapbufmp_close(handle_ptr);
575 575
576 printk(KERN_ERR "_heapbufmp_create failed status: %x\n", retval); 576 pr_err("_heapbufmp_create failed status: %x\n", retval);
577 return retval; 577 return retval;
578} 578}
579 579
@@ -620,7 +620,7 @@ void *heapbufmp_create(const struct heapbufmp_params *params)
620 return (void *)handle; 620 return (void *)handle;
621 621
622error: 622error:
623 printk(KERN_ERR "heapbufmp_create failed status: %x\n", retval); 623 pr_err("heapbufmp_create failed status: %x\n", retval);
624 return (void *)handle; 624 return (void *)handle;
625} 625}
626EXPORT_SYMBOL(heapbufmp_create); 626EXPORT_SYMBOL(heapbufmp_create);
@@ -740,7 +740,7 @@ device_busy_error:
740 gatemp_leave(obj->gate, key); 740 gatemp_leave(obj->gate, key);
741 741
742error: 742error:
743 printk(KERN_ERR "heapbufmp_delete failed status: %x\n", retval); 743 pr_err("heapbufmp_delete failed status: %x\n", retval);
744 return retval; 744 return retval;
745} 745}
746EXPORT_SYMBOL(heapbufmp_delete); 746EXPORT_SYMBOL(heapbufmp_delete);
@@ -831,7 +831,7 @@ int heapbufmp_open(char *name, void **handle_ptr)
831 return 0; 831 return 0;
832 832
833error: 833error:
834 printk(KERN_ERR "heapbufmp_open failed status: %x\n", retval); 834 pr_err("heapbufmp_open failed status: %x\n", retval);
835 return retval; 835 return retval;
836} 836}
837EXPORT_SYMBOL(heapbufmp_open); 837EXPORT_SYMBOL(heapbufmp_open);
@@ -908,7 +908,7 @@ int heapbufmp_close(void **handle_ptr)
908 return 0; 908 return 0;
909 909
910error: 910error:
911 printk(KERN_ERR "heapbufmp_close failed status: %x\n", retval); 911 pr_err("heapbufmp_close failed status: %x\n", retval);
912 return retval; 912 return retval;
913} 913}
914EXPORT_SYMBOL(heapbufmp_close); 914EXPORT_SYMBOL(heapbufmp_close);
@@ -1001,11 +1001,11 @@ void *heapbufmp_alloc(void *hphandle, u32 size, u32 align)
1001 gatemp_leave(obj->gate, key); 1001 gatemp_leave(obj->gate, key);
1002 1002
1003 if (block == NULL) 1003 if (block == NULL)
1004 printk(KERN_ERR "heapbufmp_alloc returned NULL\n"); 1004 pr_err("heapbufmp_alloc returned NULL\n");
1005 1005
1006 return block; 1006 return block;
1007error: 1007error:
1008 printk(KERN_ERR "heapbufmp_alloc failed status: %x\n", retval); 1008 pr_err("heapbufmp_alloc failed status: %x\n", retval);
1009 return NULL; 1009 return NULL;
1010} 1010}
1011EXPORT_SYMBOL(heapbufmp_alloc); 1011EXPORT_SYMBOL(heapbufmp_alloc);
@@ -1079,7 +1079,7 @@ int heapbufmp_free(void *hphandle, void *block, u32 size)
1079 return 0; 1079 return 0;
1080 1080
1081error: 1081error:
1082 printk(KERN_ERR "heapbufmp_free failed status: %x\n", retval); 1082 pr_err("heapbufmp_free failed status: %x\n", retval);
1083 return retval; 1083 return retval;
1084} 1084}
1085EXPORT_SYMBOL(heapbufmp_free); 1085EXPORT_SYMBOL(heapbufmp_free);
@@ -1149,8 +1149,7 @@ void heapbufmp_get_stats(void *hphandle, struct memory_stats *stats)
1149 1149
1150error: 1150error:
1151 if (retval < 0) 1151 if (retval < 0)
1152 printk(KERN_ERR "heapbufmp_get_stats status: [0x%x]\n", 1152 pr_err("heapbufmp_get_stats status: [0x%x]\n", retval);
1153 retval);
1154} 1153}
1155EXPORT_SYMBOL(heapbufmp_get_stats); 1154EXPORT_SYMBOL(heapbufmp_get_stats);
1156 1155
@@ -1177,7 +1176,7 @@ bool heapbufmp_isblocking(void *handle)
1177 return isblocking; 1176 return isblocking;
1178 1177
1179error: 1178error:
1180 printk(KERN_ERR "heapbufmp_isblocking status: %x\n", retval); 1179 pr_err("heapbufmp_isblocking status: %x\n", retval);
1181 return isblocking; 1180 return isblocking;
1182} 1181}
1183EXPORT_SYMBOL(heapbufmp_isblocking); 1182EXPORT_SYMBOL(heapbufmp_isblocking);
@@ -1255,8 +1254,7 @@ void heapbufmp_get_extended_stats(void *hphandle,
1255 return; 1254 return;
1256 1255
1257error: 1256error:
1258 printk(KERN_ERR "heapbufmp_get_extended_stats status: %x\n", 1257 pr_err("heapbufmp_get_extended_stats status: %x\n", retval);
1259 retval);
1260} 1258}
1261EXPORT_SYMBOL(heapbufmp_get_extended_stats); 1259EXPORT_SYMBOL(heapbufmp_get_extended_stats);
1262 1260
@@ -1335,8 +1333,7 @@ int heapbufmp_shared_mem_req(const struct heapbufmp_params *params)
1335 1333
1336 return mem_req; 1334 return mem_req;
1337error: 1335error:
1338 printk(KERN_ERR "heapbufmp_shared_mem_req status: %x\n", 1336 pr_err("heapbufmp_shared_mem_req status: %x\n", status);
1339 status);
1340 return mem_req; 1337 return mem_req;
1341} 1338}
1342EXPORT_SYMBOL(heapbufmp_shared_mem_req); 1339EXPORT_SYMBOL(heapbufmp_shared_mem_req);
@@ -1415,8 +1412,7 @@ heapbufmp_open_by_addr(void *shared_addr, void **handle_ptr)
1415 return 0; 1412 return 0;
1416 1413
1417error: 1414error:
1418 printk(KERN_ERR "heapbufmp_open_by_addr status: %x\n", 1415 pr_err("heapbufmp_open_by_addr status: %x\n", retval);
1419 retval);
1420 1416
1421 return retval; 1417 return retval;
1422} 1418}
@@ -1554,6 +1550,6 @@ created_free_list_error:
1554 listmp_delete(&obj->free_list); 1550 listmp_delete(&obj->free_list);
1555 1551
1556error: 1552error:
1557 printk(KERN_ERR "heapmem_post_init status: %x\n", retval); 1553 pr_err("heapmem_post_init status: %x\n", retval);
1558 return retval; 1554 return retval;
1559} 1555}
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)
155 sizeof(struct heapmemmp_config)); 155 sizeof(struct heapmemmp_config));
156 return 0; 156 return 0;
157error: 157error:
158 printk(KERN_ERR "heapmemmp_get_config failed status: %x\n", retval); 158 pr_err("heapmemmp_get_config failed status: %x\n", retval);
159 return retval; 159 return retval;
160} 160}
161EXPORT_SYMBOL(heapmemmp_get_config); 161EXPORT_SYMBOL(heapmemmp_get_config);
@@ -233,7 +233,7 @@ int heapmemmp_setup(const struct heapmemmp_config *cfg)
233 return 0; 233 return 0;
234 234
235error: 235error:
236 printk(KERN_ERR "heapmemmp_setup failed status: %x\n", retval); 236 pr_err("heapmemmp_setup failed status: %x\n", retval);
237 return retval; 237 return retval;
238} 238}
239EXPORT_SYMBOL(heapmemmp_setup); 239EXPORT_SYMBOL(heapmemmp_setup);
@@ -304,7 +304,7 @@ int heapmemmp_destroy(void)
304 return 0; 304 return 0;
305 305
306error: 306error:
307 printk(KERN_ERR "heapmemmp_destroy failed status: %x\n", retval); 307 pr_err("heapmemmp_destroy failed status: %x\n", retval);
308 return retval; 308 return retval;
309} 309}
310EXPORT_SYMBOL(heapmemmp_destroy); 310EXPORT_SYMBOL(heapmemmp_destroy);
@@ -331,7 +331,7 @@ void heapmemmp_params_init(struct heapmemmp_params *params)
331 331
332 return; 332 return;
333error: 333error:
334 printk(KERN_ERR "heapmemmp_params_init failed status: %x\n", retval); 334 pr_err("heapmemmp_params_init failed status: %x\n", retval);
335} 335}
336EXPORT_SYMBOL(heapmemmp_params_init); 336EXPORT_SYMBOL(heapmemmp_params_init);
337 337
@@ -543,7 +543,7 @@ error:
543 heapmemmp_delete(handle_ptr); 543 heapmemmp_delete(handle_ptr);
544 else 544 else
545 heapmemmp_close(handle_ptr); 545 heapmemmp_close(handle_ptr);
546 printk(KERN_ERR "_heapmemmp_create failed status: %x\n", retval); 546 pr_err("_heapmemmp_create failed status: %x\n", retval);
547 return retval; 547 return retval;
548} 548}
549 549
@@ -583,7 +583,7 @@ void *heapmemmp_create(const struct heapmemmp_params *params)
583 return (void *)handle; 583 return (void *)handle;
584 584
585error: 585error:
586 printk(KERN_ERR "heapmemmp_create failed status: %x\n", retval); 586 pr_err("heapmemmp_create failed status: %x\n", retval);
587 return (void *)handle; 587 return (void *)handle;
588} 588}
589EXPORT_SYMBOL(heapmemmp_create); 589EXPORT_SYMBOL(heapmemmp_create);
@@ -696,7 +696,7 @@ device_busy_error:
696 gatemp_leave(obj->gate, key); 696 gatemp_leave(obj->gate, key);
697 697
698error: 698error:
699 printk(KERN_ERR "heapmemmp_delete failed status: %x\n", retval); 699 pr_err("heapmemmp_delete failed status: %x\n", retval);
700 return retval; 700 return retval;
701} 701}
702EXPORT_SYMBOL(heapmemmp_delete); 702EXPORT_SYMBOL(heapmemmp_delete);
@@ -785,7 +785,7 @@ int heapmemmp_open(char *name, void **handle_ptr)
785 return 0; 785 return 0;
786 786
787error: 787error:
788 printk(KERN_ERR "heapmemmp_open failed status: %x\n", retval); 788 pr_err("heapmemmp_open failed status: %x\n", retval);
789 return retval; 789 return retval;
790} 790}
791EXPORT_SYMBOL(heapmemmp_open); 791EXPORT_SYMBOL(heapmemmp_open);
@@ -857,7 +857,7 @@ int heapmemmp_close(void **handle_ptr)
857 return 0; 857 return 0;
858 858
859error: 859error:
860 printk(KERN_ERR "heapmemmp_close failed status: %x\n", retval); 860 pr_err("heapmemmp_close failed status: %x\n", retval);
861 return retval; 861 return retval;
862} 862}
863EXPORT_SYMBOL(heapmemmp_close); 863EXPORT_SYMBOL(heapmemmp_close);
@@ -1102,11 +1102,11 @@ void *heapmemmp_alloc(void *hphandle, u32 size, u32 align)
1102 gatemp_leave(obj->gate, key); 1102 gatemp_leave(obj->gate, key);
1103 1103
1104 if (alloc_addr == NULL) 1104 if (alloc_addr == NULL)
1105 printk(KERN_ERR "heapmemmp_alloc returned NULL\n"); 1105 pr_err("heapmemmp_alloc returned NULL\n");
1106 return alloc_addr; 1106 return alloc_addr;
1107 1107
1108error: 1108error:
1109 printk(KERN_ERR "heapmemmp_alloc failed status: %x\n", retval); 1109 pr_err("heapmemmp_alloc failed status: %x\n", retval);
1110 return NULL; 1110 return NULL;
1111} 1111}
1112EXPORT_SYMBOL(heapmemmp_alloc); 1112EXPORT_SYMBOL(heapmemmp_alloc);
@@ -1269,7 +1269,7 @@ int heapmemmp_free(void *hphandle, void *addr, u32 size)
1269 return 0; 1269 return 0;
1270 1270
1271error: 1271error:
1272 printk(KERN_ERR "heapmemmp_free failed status: %x\n", retval); 1272 pr_err("heapmemmp_free failed status: %x\n", retval);
1273 return retval; 1273 return retval;
1274} 1274}
1275EXPORT_SYMBOL(heapmemmp_free); 1275EXPORT_SYMBOL(heapmemmp_free);
@@ -1342,7 +1342,7 @@ void heapmemmp_get_stats(void *hphandle, struct memory_stats *stats)
1342 gatemp_leave(obj->gate, key); 1342 gatemp_leave(obj->gate, key);
1343error: 1343error:
1344 if (status < 0) 1344 if (status < 0)
1345 printk(KERN_ERR "heapmemmp_get_stats status: %x\n", status); 1345 pr_err("heapmemmp_get_stats status: %x\n", status);
1346} 1346}
1347EXPORT_SYMBOL(heapmemmp_get_stats); 1347EXPORT_SYMBOL(heapmemmp_get_stats);
1348 1348
@@ -1367,7 +1367,7 @@ bool heapmemmp_isblocking(void *handle)
1367 return isblocking; 1367 return isblocking;
1368 1368
1369error: 1369error:
1370 printk(KERN_ERR "heapmemmp_isblocking status: %x\n", retval); 1370 pr_err("heapmemmp_isblocking status: %x\n", retval);
1371 return isblocking; 1371 return isblocking;
1372} 1372}
1373EXPORT_SYMBOL(heapmemmp_isblocking); 1373EXPORT_SYMBOL(heapmemmp_isblocking);
@@ -1414,8 +1414,7 @@ void heapmemmp_get_extended_stats(void *hphandle,
1414 return; 1414 return;
1415 1415
1416error: 1416error:
1417 printk(KERN_ERR "heapmemmp_get_extended_stats status: %x\n", 1417 pr_err("heapmemmp_get_extended_stats status: %x\n", status);
1418 status);
1419} 1418}
1420EXPORT_SYMBOL(heapmemmp_get_extended_stats); 1419EXPORT_SYMBOL(heapmemmp_get_extended_stats);
1421 1420
@@ -1461,8 +1460,7 @@ int heapmemmp_shared_mem_req(const struct heapmemmp_params *params)
1461 return mem_req; 1460 return mem_req;
1462 1461
1463error: 1462error:
1464 printk(KERN_ERR "heapmemmp_shared_mem_req retval: %x\n", 1463 pr_err("heapmemmp_shared_mem_req retval: %x\n", retval);
1465 retval);
1466 return mem_req; 1464 return mem_req;
1467} 1465}
1468EXPORT_SYMBOL(heapmemmp_shared_mem_req); 1466EXPORT_SYMBOL(heapmemmp_shared_mem_req);
@@ -1544,8 +1542,7 @@ heapmemmp_open_by_addr(void *shared_addr, void **handle_ptr)
1544 return 0; 1542 return 0;
1545 1543
1546error: 1544error:
1547 printk(KERN_ERR "heapmemmp_open_by_addr status: %x\n", 1545 pr_err("heapmemmp_open_by_addr status: %x\n", retval);
1548 retval);
1549 return retval; 1546 return retval;
1550} 1547}
1551 1548
@@ -1625,8 +1622,7 @@ static int heapmemmp_post_init(struct heapmemmp_object *handle)
1625 1622
1626 return 0; 1623 return 0;
1627error: 1624error:
1628 printk(KERN_ERR "heapmemmp_post_init status: %x\n", 1625 pr_err("heapmemmp_post_init status: %x\n", retval);
1629 retval);
1630 return retval; 1626 return retval;
1631} 1627}
1632 1628
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)
223 struct ipc_proc_entry *ipc; 223 struct ipc_proc_entry *ipc;
224 224
225 if (remote_proc_id >= MULTIPROC_MAXPROCESSORS) { 225 if (remote_proc_id >= MULTIPROC_MAXPROCESSORS) {
226 printk(KERN_ERR "Invalid remote_proc_id passed\n"); 226 pr_err("Invalid remote_proc_id passed\n");
227 return IPC_E_FAIL; 227 return IPC_E_FAIL;
228 } 228 }
229 229
@@ -247,11 +247,10 @@ int ipc_attach(u16 remote_proc_id)
247 ipc_shared_addr); 247 ipc_shared_addr);
248 248
249 if (status < 0) 249 if (status < 0)
250 printk(KERN_ERR "ipc_attach : ipc_proc_sync_start " 250 pr_err("ipc_attach : ipc_proc_sync_start "
251 "failed [0x%x]\n", status); 251 "failed [0x%x]\n", status);
252 else 252 else
253 printk(KERN_ERR "ipc_proc_sync_start : status [0x%x]\n", 253 pr_err("ipc_proc_sync_start : status [0x%x]\n", status);
254 status);
255 254
256 255
257 if (status >= 0) { 256 if (status >= 0) {
@@ -259,11 +258,10 @@ int ipc_attach(u16 remote_proc_id)
259 status = gatemp_attach(remote_proc_id, ipc_module-> 258 status = gatemp_attach(remote_proc_id, ipc_module->
260 gatemp_shared_addr); 259 gatemp_shared_addr);
261 if (status < 0) 260 if (status < 0)
262 printk(KERN_ERR "ipc_attach : gatemp_attach " 261 pr_err("ipc_attach : gatemp_attach "
263 "failed [0x%x]\n", status); 262 "failed [0x%x]\n", status);
264 else 263 else
265 printk(KERN_ERR "gatemp_attach : status [0x%x]\n", 264 pr_err("gatemp_attach : status [0x%x]\n", status);
266 status);
267 265
268 } 266 }
269 267
@@ -271,10 +269,10 @@ int ipc_attach(u16 remote_proc_id)
271 if (status >= 0) { 269 if (status >= 0) {
272 status = sharedregion_attach(remote_proc_id); 270 status = sharedregion_attach(remote_proc_id);
273 if (status < 0) 271 if (status < 0)
274 printk(KERN_ERR "ipc_attach : sharedregion_attach " 272 pr_err("ipc_attach : sharedregion_attach "
275 "failed [0x%x]\n", status); 273 "failed [0x%x]\n", status);
276 else 274 else
277 printk(KERN_ERR "sharedregion_attach : status " 275 pr_err("sharedregion_attach : status "
278 "[0x%x]\n", status); 276 "[0x%x]\n", status);
279 } 277 }
280 278
@@ -296,11 +294,11 @@ int ipc_attach(u16 remote_proc_id)
296 if (slave->notify_sr_ptr == 294 if (slave->notify_sr_ptr ==
297 SHAREDREGION_INVALIDSRPTR) { 295 SHAREDREGION_INVALIDSRPTR) {
298 status = IPC_E_FAIL; 296 status = IPC_E_FAIL;
299 printk(KERN_ERR "ipc_attach : " 297 pr_err("ipc_attach : "
300 "sharedregion_get_srptr " 298 "sharedregion_get_srptr "
301 "failed [0x%x]\n", status); 299 "failed [0x%x]\n", status);
302 } else { 300 } else {
303 printk(KERN_ERR 301 pr_err(
304 "sharedregion_get_srptr : " 302 "sharedregion_get_srptr : "
305 "status [0x%x]\n", status); 303 "status [0x%x]\n", status);
306 } 304 }
@@ -309,11 +307,11 @@ int ipc_attach(u16 remote_proc_id)
309 notify_sr_ptr); 307 notify_sr_ptr);
310 if (notify_shared_addr == NULL) { 308 if (notify_shared_addr == NULL) {
311 status = IPC_E_FAIL; 309 status = IPC_E_FAIL;
312 printk(KERN_ERR "ipc_attach : " 310 pr_err("ipc_attach : "
313 "sharedregion_get_ptr " 311 "sharedregion_get_ptr "
314 "failed [0x%x]\n", status); 312 "failed [0x%x]\n", status);
315 } else { 313 } else {
316 printk(KERN_ERR 314 pr_err(
317 "sharedregion_get_ptr : " 315 "sharedregion_get_ptr : "
318 "status [0x%x]\n", status); 316 "status [0x%x]\n", status);
319 } 317 }
@@ -323,11 +321,11 @@ int ipc_attach(u16 remote_proc_id)
323 status = notify_attach(remote_proc_id, 321 status = notify_attach(remote_proc_id,
324 notify_shared_addr); 322 notify_shared_addr);
325 if (status < 0) 323 if (status < 0)
326 printk(KERN_ERR "ipc_attach : " 324 pr_err("ipc_attach : "
327 "notify_attach " 325 "notify_attach "
328 "failed [0x%x]\n", status); 326 "failed [0x%x]\n", status);
329 else 327 else
330 printk(KERN_ERR 328 pr_err(
331 "notify_attach : " 329 "notify_attach : "
332 "status [0x%x]\n", status); 330 "status [0x%x]\n", status);
333 } 331 }
@@ -339,11 +337,11 @@ int ipc_attach(u16 remote_proc_id)
339 status = ipu_pm_attach(remote_proc_id, ipc_module-> 337 status = ipu_pm_attach(remote_proc_id, ipc_module->
340 ipu_pm_shared_addr); 338 ipu_pm_shared_addr);
341 if (status < 0) 339 if (status < 0)
342 printk(KERN_ERR "ipc_attach : " 340 pr_err("ipc_attach : "
343 "ipu_pm_attach " 341 "ipu_pm_attach "
344 "failed [0x%x]\n", status); 342 "failed [0x%x]\n", status);
345 else 343 else
346 printk(KERN_ERR 344 pr_err(
347 "ipu_pm_attach : " 345 "ipu_pm_attach : "
348 "status [0x%x]\n", status); 346 "status [0x%x]\n", status);
349 } 347 }
@@ -362,11 +360,11 @@ int ipc_attach(u16 remote_proc_id)
362 sharedregion_get_srptr(nsrn_shared_addr, 0); 360 sharedregion_get_srptr(nsrn_shared_addr, 0);
363 if (slave->nsrn_sr_ptr == SHAREDREGION_INVALIDSRPTR) { 361 if (slave->nsrn_sr_ptr == SHAREDREGION_INVALIDSRPTR) {
364 status = IPC_E_FAIL; 362 status = IPC_E_FAIL;
365 printk(KERN_ERR "ipc_attach : " 363 pr_err("ipc_attach : "
366 "sharedregion_get_srptr " 364 "sharedregion_get_srptr "
367 "failed [0x%x]\n", status); 365 "failed [0x%x]\n", status);
368 } else { 366 } else {
369 printk(KERN_ERR 367 pr_err(
370 "sharedregion_get_srptr : " 368 "sharedregion_get_srptr : "
371 "status [0x%x]\n", status); 369 "status [0x%x]\n", status);
372 } 370 }
@@ -375,11 +373,11 @@ int ipc_attach(u16 remote_proc_id)
375 sharedregion_get_ptr(slave->nsrn_sr_ptr); 373 sharedregion_get_ptr(slave->nsrn_sr_ptr);
376 if (nsrn_shared_addr == NULL) { 374 if (nsrn_shared_addr == NULL) {
377 status = IPC_E_FAIL; 375 status = IPC_E_FAIL;
378 printk(KERN_ERR "ipc_attach : " 376 pr_err("ipc_attach : "
379 "sharedregion_get_ptr " 377 "sharedregion_get_ptr "
380 "failed [0x%x]\n", status); 378 "failed [0x%x]\n", status);
381 } else { 379 } else {
382 printk(KERN_ERR 380 pr_err(
383 "sharedregion_get_ptr : " 381 "sharedregion_get_ptr : "
384 "status [0x%x]\n", status); 382 "status [0x%x]\n", status);
385 } 383 }
@@ -391,11 +389,11 @@ int ipc_attach(u16 remote_proc_id)
391 nsrn_shared_addr); 389 nsrn_shared_addr);
392 390
393 if (status < 0) 391 if (status < 0)
394 printk(KERN_ERR "ipc_attach : " 392 pr_err("ipc_attach : "
395 "nameserver_remotenotify_attach " 393 "nameserver_remotenotify_attach "
396 "failed [0x%x]\n", status); 394 "failed [0x%x]\n", status);
397 else 395 else
398 printk(KERN_ERR 396 pr_err(
399 "nameserver_remotenotify_attach : " 397 "nameserver_remotenotify_attach : "
400 "status [0x%x]\n", status); 398 "status [0x%x]\n", status);
401 } 399 }
@@ -415,11 +413,11 @@ int ipc_attach(u16 remote_proc_id)
415 if (slave->transport_sr_ptr == 413 if (slave->transport_sr_ptr ==
416 SHAREDREGION_INVALIDSRPTR) { 414 SHAREDREGION_INVALIDSRPTR) {
417 status = IPC_E_FAIL; 415 status = IPC_E_FAIL;
418 printk(KERN_ERR "ipc_attach : " 416 pr_err("ipc_attach : "
419 "sharedregion_get_srptr " 417 "sharedregion_get_srptr "
420 "failed [0x%x]\n", status); 418 "failed [0x%x]\n", status);
421 } else { 419 } else {
422 printk(KERN_ERR 420 pr_err(
423 "sharedregion_get_srptr : " 421 "sharedregion_get_srptr : "
424 "status [0x%x]\n", status); 422 "status [0x%x]\n", status);
425 } 423 }
@@ -428,11 +426,11 @@ int ipc_attach(u16 remote_proc_id)
428 transport_sr_ptr); 426 transport_sr_ptr);
429 if (msgq_shared_addr == NULL) { 427 if (msgq_shared_addr == NULL) {
430 status = IPC_E_FAIL; 428 status = IPC_E_FAIL;
431 printk(KERN_ERR "ipc_attach : " 429 pr_err("ipc_attach : "
432 "sharedregion_get_ptr " 430 "sharedregion_get_ptr "
433 "failed [0x%x]\n", status); 431 "failed [0x%x]\n", status);
434 } else { 432 } else {
435 printk(KERN_ERR 433 pr_err(
436 "sharedregion_get_ptr : " 434 "sharedregion_get_ptr : "
437 "status [0x%x]\n", status); 435 "status [0x%x]\n", status);
438 } 436 }
@@ -443,11 +441,11 @@ int ipc_attach(u16 remote_proc_id)
443 status = messageq_attach(remote_proc_id, 441 status = messageq_attach(remote_proc_id,
444 msgq_shared_addr); 442 msgq_shared_addr);
445 if (status < 0) 443 if (status < 0)
446 printk(KERN_ERR "ipc_attach : " 444 pr_err("ipc_attach : "
447 "messageq_attach " 445 "messageq_attach "
448 "failed [0x%x]\n", status); 446 "failed [0x%x]\n", status);
449 else 447 else
450 printk(KERN_ERR 448 pr_err(
451 "messageq_attach : " 449 "messageq_attach : "
452 "status [0x%x]\n", status); 450 "status [0x%x]\n", status);
453 } 451 }
@@ -465,11 +463,11 @@ int ipc_attach(u16 remote_proc_id)
465 status = ipc_proc_sync_finish(remote_proc_id, 463 status = ipc_proc_sync_finish(remote_proc_id,
466 ipc_module->ipc_shared_addr); 464 ipc_module->ipc_shared_addr);
467 if (status < 0) 465 if (status < 0)
468 printk(KERN_ERR "ipc_attach : " 466 pr_err("ipc_attach : "
469 "ipc_proc_sync_finish " 467 "ipc_proc_sync_finish "
470 "failed [0x%x]\n", status); 468 "failed [0x%x]\n", status);
471 else 469 else
472 printk(KERN_ERR 470 pr_err(
473 "ipc_proc_sync_finish : " 471 "ipc_proc_sync_finish : "
474 "status [0x%x]\n", status); 472 "status [0x%x]\n", status);
475 } 473 }
@@ -477,7 +475,7 @@ int ipc_attach(u16 remote_proc_id)
477 if (status >= 0) 475 if (status >= 0)
478 ipc->is_attached = true; 476 ipc->is_attached = true;
479 else 477 else
480 printk(KERN_ERR "ipc_attach failed! status = 0x%x\n", status); 478 pr_err("ipc_attach failed! status = 0x%x\n", status);
481 479
482 return status; 480 return status;
483} 481}
@@ -526,11 +524,11 @@ int ipc_detach(u16 remote_proc_id)
526 /* call messageq_detach for remote processor */ 524 /* call messageq_detach for remote processor */
527 status = messageq_detach(remote_proc_id); 525 status = messageq_detach(remote_proc_id);
528 if (status < 0) 526 if (status < 0)
529 printk(KERN_ERR "ipc_detach : " 527 pr_err("ipc_detach : "
530 "messageq_detach " 528 "messageq_detach "
531 "failed [0x%x]\n", status); 529 "failed [0x%x]\n", status);
532 else 530 else
533 printk(KERN_ERR 531 pr_err(
534 "messageq_detach : " 532 "messageq_detach : "
535 "status [0x%x]\n", status); 533 "status [0x%x]\n", status);
536 534
@@ -563,11 +561,11 @@ int ipc_detach(u16 remote_proc_id)
563 status = nameserver_remotenotify_detach( 561 status = nameserver_remotenotify_detach(
564 remote_proc_id); 562 remote_proc_id);
565 if (status < 0) 563 if (status < 0)
566 printk(KERN_ERR "ipc_detach : " 564 pr_err("ipc_detach : "
567 "nameserver_remotenotify_detach " 565 "nameserver_remotenotify_detach "
568 "failed [0x%x]\n", status); 566 "failed [0x%x]\n", status);
569 else 567 else
570 printk(KERN_ERR 568 pr_err(
571 "nameserver_remotenotify_detach : " 569 "nameserver_remotenotify_detach : "
572 "status [0x%x]\n", status); 570 "status [0x%x]\n", status);
573 571
@@ -595,11 +593,11 @@ int ipc_detach(u16 remote_proc_id)
595 /* call ipu_pm_detach for remote processor */ 593 /* call ipu_pm_detach for remote processor */
596 status = ipu_pm_detach(remote_proc_id); 594 status = ipu_pm_detach(remote_proc_id);
597 if (status < 0) 595 if (status < 0)
598 printk(KERN_ERR "ipc_detach : " 596 pr_err("ipc_detach : "
599 "ipu_pm_detach " 597 "ipu_pm_detach "
600 "failed [0x%x]\n", status); 598 "failed [0x%x]\n", status);
601 else 599 else
602 printk(KERN_ERR 600 pr_err(
603 "ipu_pm_detach : " 601 "ipu_pm_detach : "
604 "status [0x%x]\n", status); 602 "status [0x%x]\n", status);
605 } 603 }
@@ -608,11 +606,11 @@ int ipc_detach(u16 remote_proc_id)
608 /* call notify_detach for remote processor */ 606 /* call notify_detach for remote processor */
609 status = notify_detach(remote_proc_id); 607 status = notify_detach(remote_proc_id);
610 if (status < 0) 608 if (status < 0)
611 printk(KERN_ERR "ipc_detach : " 609 pr_err("ipc_detach : "
612 "notify_detach " 610 "notify_detach "
613 "failed [0x%x]\n", status); 611 "failed [0x%x]\n", status);
614 else 612 else
615 printk(KERN_ERR 613 pr_err(
616 "notify_detach : " 614 "notify_detach : "
617 "status [0x%x]\n", status); 615 "status [0x%x]\n", status);
618 616
@@ -680,8 +678,7 @@ int ipc_detach(u16 remote_proc_id)
680 678
681exit: 679exit:
682 if (status < 0) 680 if (status < 0)
683 printk(KERN_ERR "ipc_detach failed with status [0x%x]\n", 681 pr_err("ipc_detach failed with status [0x%x]\n", status);
684 status);
685 return status; 682 return status;
686} 683}
687 684
@@ -701,7 +698,7 @@ ipc_control(u16 proc_id, u32 cmd_id, void *arg)
701#if defined CONFIG_SYSLINK_USE_SYSMGR 698#if defined CONFIG_SYSLINK_USE_SYSMGR
702 status = platform_load_callback(proc_id, arg); 699 status = platform_load_callback(proc_id, arg);
703 if (status < 0) 700 if (status < 0)
704 printk(KERN_ERR "ipc_control : platform_load_callback " 701 pr_err("ipc_control : platform_load_callback "
705 "failed [0x%x]\n", status); 702 "failed [0x%x]\n", status);
706#endif 703#endif
707 } 704 }
@@ -712,7 +709,7 @@ ipc_control(u16 proc_id, u32 cmd_id, void *arg)
712#if defined CONFIG_SYSLINK_USE_SYSMGR 709#if defined CONFIG_SYSLINK_USE_SYSMGR
713 status = platform_start_callback(proc_id, arg); 710 status = platform_start_callback(proc_id, arg);
714 if (status < 0) 711 if (status < 0)
715 printk(KERN_ERR "ipc_control : platform_start_callback" 712 pr_err("ipc_control : platform_start_callback"
716 " failed [0x%x]\n", status); 713 " failed [0x%x]\n", status);
717#endif 714#endif
718 } 715 }
@@ -723,7 +720,7 @@ ipc_control(u16 proc_id, u32 cmd_id, void *arg)
723#if defined CONFIG_SYSLINK_USE_SYSMGR 720#if defined CONFIG_SYSLINK_USE_SYSMGR
724 status = platform_stop_callback(proc_id, arg); 721 status = platform_stop_callback(proc_id, arg);
725 if (status < 0) 722 if (status < 0)
726 printk(KERN_ERR "ipc_control : platform_stop_callback" 723 pr_err("ipc_control : platform_stop_callback"
727 " failed [0x%x]\n", status); 724 " failed [0x%x]\n", status);
728#endif 725#endif
729 } 726 }
@@ -732,7 +729,7 @@ ipc_control(u16 proc_id, u32 cmd_id, void *arg)
732 default: 729 default:
733 { 730 {
734 status = -EINVAL; 731 status = -EINVAL;
735 printk(KERN_ERR "ipc_control : invalid " 732 pr_err("ipc_control : invalid "
736 " command code [0x%x]\n", cmd_id); 733 " command code [0x%x]\n", cmd_id);
737 } 734 }
738 break; 735 break;
@@ -911,10 +908,9 @@ static int ipc_proc_sync_start(u16 remote_proc_id, void *shared_addr)
911 } 908 }
912exit: 909exit:
913 if (status < 0) 910 if (status < 0)
914 printk(KERN_ERR "ipc_proc_sync_start failed: status [0x%x]\n", 911 pr_err("ipc_proc_sync_start failed: status [0x%x]\n", status);
915 status);
916 else 912 else
917 printk(KERN_ERR "ipc_proc_sync_start done\n"); 913 pr_err("ipc_proc_sync_start done\n");
918 914
919 return status; 915 return status;
920} 916}
@@ -1043,8 +1039,7 @@ int ipc_read_config(u16 remote_proc_id, u32 tag, void *cfg, u32 size)
1043 1039
1044exit: 1040exit:
1045 if (status < 0) 1041 if (status < 0)
1046 printk(KERN_ERR "ipc_read_config failed: status [0x%x]\n", 1042 pr_err("ipc_read_config failed: status [0x%x]\n", status);
1047 status);
1048 1043
1049 return status; 1044 return status;
1050} 1045}
@@ -1151,8 +1146,7 @@ int ipc_write_config(u16 remote_proc_id, u32 tag, void *cfg, u32 size)
1151 1146
1152exit: 1147exit:
1153 if (status < 0) 1148 if (status < 0)
1154 printk(KERN_ERR "ipc_write_config failed: status [0x%x]\n", 1149 pr_err("ipc_write_config failed: status [0x%x]\n", status);
1155 status);
1156 1150
1157 return status; 1151 return status;
1158} 1152}
@@ -1270,8 +1264,7 @@ int ipc_start(void)
1270 1264
1271exit: 1265exit:
1272 if (status < 0) 1266 if (status < 0)
1273 printk(KERN_ERR "ipc_start failed: status [0x%x]\n", 1267 pr_err("ipc_start failed: status [0x%x]\n", status);
1274 status);
1275 1268
1276 return status; 1269 return status;
1277} 1270}
@@ -1360,7 +1353,7 @@ int ipc_stop(void)
1360 } 1353 }
1361exit: 1354exit:
1362 if (status < 0) 1355 if (status < 0)
1363 printk(KERN_ERR "ipc_stop failed: status [0x%x]\n", status); 1356 pr_err("ipc_stop failed: status [0x%x]\n", status);
1364 1357
1365 return status; 1358 return status;
1366} 1359}
@@ -1393,9 +1386,7 @@ void ipc_get_config(struct ipc_config *cfg_params)
1393 1386
1394exit: 1387exit:
1395 if (status < 0) 1388 if (status < 0)
1396 printk(KERN_ERR "ipc_get_config failed: status [0x%x]\n", 1389 pr_err("ipc_get_config failed: status [0x%x]\n", status);
1397 status);
1398
1399} 1390}
1400 1391
1401 1392
@@ -1445,7 +1436,7 @@ int ipc_setup(const struct ipc_config *cfg)
1445 1436
1446exit: 1437exit:
1447 if (status < 0) 1438 if (status < 0)
1448 printk(KERN_ERR "ipc_setup failed: status [0x%x]\n", status); 1439 pr_err("ipc_setup failed: status [0x%x]\n", status);
1449 1440
1450 return status; 1441 return status;
1451} 1442}
@@ -1494,7 +1485,7 @@ int ipc_destroy(void)
1494 1485
1495exit: 1486exit:
1496 if (status < 0) 1487 if (status < 0)
1497 printk(KERN_ERR "ipc_destroy failed: status [0x%x]\n", status); 1488 pr_err("ipc_destroy failed: status [0x%x]\n", status);
1498 1489
1499 return status; 1490 return status;
1500} 1491}
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)
369 ipc_major = MAJOR(dev); 369 ipc_major = MAJOR(dev);
370 370
371 if (retval < 0) { 371 if (retval < 0) {
372 printk(KERN_ERR "ipc_init: can't get major %x\n", ipc_major); 372 pr_err("ipc_init: can't get major %x\n", ipc_major);
373 goto exit; 373 goto exit;
374 } 374 }
375 375
376 ipc_device = kmalloc(sizeof(struct ipc_device), GFP_KERNEL); 376 ipc_device = kmalloc(sizeof(struct ipc_device), GFP_KERNEL);
377 if (!ipc_device) { 377 if (!ipc_device) {
378 printk(KERN_ERR "ipc_init: memory allocation failed for " 378 pr_err("ipc_init: memory allocation failed for ipc_device\n");
379 "ipc_device\n");
380 retval = -ENOMEM; 379 retval = -ENOMEM;
381 goto unreg_exit; 380 goto unreg_exit;
382 } 381 }
@@ -387,13 +386,13 @@ static int __init ipc_init(void)
387 386
388 retval = ipc_modules_init(); 387 retval = ipc_modules_init();
389 if (retval) { 388 if (retval) {
390 printk(KERN_ERR "ipc_init: ipc initialization failed\n"); 389 pr_err("ipc_init: ipc initialization failed\n");
391 goto unreg_exit; 390 goto unreg_exit;
392 391
393 } 392 }
394 ipc_class = class_create(THIS_MODULE, "syslink_ipc"); 393 ipc_class = class_create(THIS_MODULE, "syslink_ipc");
395 if (IS_ERR(ipc_class)) { 394 if (IS_ERR(ipc_class)) {
396 printk(KERN_ERR "ipc_init: error creating ipc class\n"); 395 pr_err("ipc_init: error creating ipc class\n");
397 retval = PTR_ERR(ipc_class); 396 retval = PTR_ERR(ipc_class);
398 goto unreg_exit; 397 goto unreg_exit;
399 } 398 }
@@ -404,7 +403,7 @@ static int __init ipc_init(void)
404 ipc_device->cdev.owner = THIS_MODULE; 403 ipc_device->cdev.owner = THIS_MODULE;
405 retval = cdev_add(&ipc_device->cdev, dev, IPC_DEVICES); 404 retval = cdev_add(&ipc_device->cdev, dev, IPC_DEVICES);
406 if (retval) { 405 if (retval) {
407 printk(KERN_ERR "ipc_init: failed to add the ipc device\n"); 406 pr_err("ipc_init: failed to add the ipc device\n");
408 goto class_exit; 407 goto class_exit;
409 } 408 }
410 return retval; 409 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)
150 } 150 }
151 151
152exit: 152exit:
153 if (status < 0) { 153 if (status < 0)
154 printk(KERN_ERR "listmp_get_config failed: status = 0x%x\n", 154 pr_err("listmp_get_config failed: status = 0x%x\n", status);
155 status);
156 }
157 return; 155 return;
158} 156}
159 157
@@ -218,7 +216,7 @@ clean_nameserver:
218 WARN_ON(status1 < 0); 216 WARN_ON(status1 < 0);
219 atomic_set(&listmp_module->ref_count, LISTMP_MAKE_MAGICSTAMP(0)); 217 atomic_set(&listmp_module->ref_count, LISTMP_MAKE_MAGICSTAMP(0));
220exit: 218exit:
221 printk(KERN_ERR "listmp_setup failed! status = 0x%x\n", status); 219 pr_err("listmp_setup failed! status = 0x%x\n", status);
222 return status; 220 return status;
223} 221}
224 222
@@ -281,10 +279,8 @@ int listmp_destroy(void)
281 atomic_set(&listmp_module->ref_count, LISTMP_MAKE_MAGICSTAMP(0)); 279 atomic_set(&listmp_module->ref_count, LISTMP_MAKE_MAGICSTAMP(0));
282 280
283exit: 281exit:
284 if (status < 0) { 282 if (status < 0)
285 printk(KERN_ERR "listmp_destroy failed! status = 0x%x\n", 283 pr_err("listmp_destroy failed! status = 0x%x\n", status);
286 status);
287 }
288 return status; 284 return status;
289} 285}
290 286
@@ -309,10 +305,8 @@ void listmp_params_init(struct listmp_params *params)
309 sizeof(struct listmp_params)); 305 sizeof(struct listmp_params));
310 306
311exit: 307exit:
312 if (status < 0) { 308 if (status < 0)
313 printk(KERN_ERR "listmp_params_init failed! status = 0x%x\n", 309 pr_err("listmp_params_init failed! status = 0x%x\n", status);
314 status);
315 }
316 return; 310 return;
317} 311}
318 312
@@ -344,10 +338,8 @@ void *listmp_create(const struct listmp_params *params)
344 mutex_unlock(listmp_module->local_lock); 338 mutex_unlock(listmp_module->local_lock);
345 339
346exit: 340exit:
347 if (status < 0) { 341 if (status < 0)
348 printk(KERN_ERR "listmp_create failed! status = 0x%x\n", 342 pr_err("listmp_create failed! status = 0x%x\n", status);
349 status);
350 }
351 return (void *)obj; 343 return (void *)obj;
352} 344}
353 345
@@ -412,10 +404,8 @@ int listmp_delete(void **listmp_handleptr)
412 *listmp_handleptr = NULL; 404 *listmp_handleptr = NULL;
413 405
414exit: 406exit:
415 if (status < 0) { 407 if (status < 0)
416 printk(KERN_ERR "listmp_delete failed! status = 0x%x\n", 408 pr_err("listmp_delete failed! status = 0x%x\n", status);
417 status);
418 }
419 return status; 409 return status;
420} 410}
421 411
@@ -497,7 +487,7 @@ int listmp_open(char *name, void **listmp_handleptr)
497 487
498exit: 488exit:
499 if (status < 0) 489 if (status < 0)
500 printk(KERN_ERR "listmp_open failed! status = 0x%x\n", status); 490 pr_err("listmp_open failed! status = 0x%x\n", status);
501 return status; 491 return status;
502} 492}
503 493
@@ -570,10 +560,8 @@ int listmp_open_by_addr(void *shared_addr, void **listmp_handleptr)
570 } 560 }
571 561
572exit: 562exit:
573 if (status < 0) { 563 if (status < 0)
574 printk(KERN_ERR "listmp_open failed! " 564 pr_err("listmp_open failed! status = 0x%x\n", status);
575 "status = 0x%x\n", status);
576 }
577 return status; 565 return status;
578} 566}
579 567
@@ -625,7 +613,7 @@ int listmp_close(void **listmp_handleptr)
625 613
626exit: 614exit:
627 if (status < 0) 615 if (status < 0)
628 printk(KERN_ERR "listmp_close failed! status = 0x%x\n", status); 616 pr_err("listmp_close failed! status = 0x%x\n", status);
629 return status; 617 return status;
630} 618}
631 619
@@ -693,10 +681,8 @@ void *listmp_get_gate(void *listmp_handle)
693 gatemp_handle = obj->gatemp_handle; 681 gatemp_handle = obj->gatemp_handle;
694 682
695exit: 683exit:
696 if (retval < 0) { 684 if (retval < 0)
697 printk(KERN_ERR "listmp_get_gate failed! status = 0x%x", 685 pr_err("listmp_get_gate failed! status = 0x%x", retval);
698 retval);
699 }
700 return gatemp_handle; 686 return gatemp_handle;
701} 687}
702 688
@@ -776,10 +762,9 @@ gate_leave_and_exit:
776 gatemp_leave(obj->gatemp_handle, key); 762 gatemp_leave(obj->gatemp_handle, key);
777 763
778exit: 764exit:
779 if (retval < 0) { 765 if (retval < 0)
780 printk(KERN_ERR "listmp_get_head failed! status = 0x%x", 766 pr_err("listmp_get_head failed! status = 0x%x", retval);
781 retval); 767
782 }
783 return elem; 768 return elem;
784} 769}
785 770
@@ -862,10 +847,9 @@ gate_leave_and_exit:
862 gatemp_leave(obj->gatemp_handle, key); 847 gatemp_leave(obj->gatemp_handle, key);
863 848
864exit: 849exit:
865 if (retval < 0) { 850 if (retval < 0)
866 printk(KERN_ERR "listmp_get_tail failed! status = 0x%x", 851 pr_err("listmp_get_tail failed! status = 0x%x", retval);
867 retval); 852
868 }
869 return elem; 853 return elem;
870} 854}
871 855
@@ -943,10 +927,8 @@ gate_leave_and_exit:
943 gatemp_leave(obj->gatemp_handle, key); 927 gatemp_leave(obj->gatemp_handle, key);
944 928
945exit: 929exit:
946 if (status < 0) { 930 if (status < 0)
947 printk(KERN_ERR "listmp_put_head failed! status = 0x%x\n", 931 pr_err("listmp_put_head failed! status = 0x%x\n", status);
948 status);
949 }
950 return status; 932 return status;
951} 933}
952 934
@@ -1031,10 +1013,8 @@ gate_leave_and_exit:
1031 gatemp_leave(obj->gatemp_handle, key); 1013 gatemp_leave(obj->gatemp_handle, key);
1032 1014
1033exit: 1015exit:
1034 if (status < 0) { 1016 if (status < 0)
1035 printk(KERN_ERR "listmp_put_tail failed! " 1017 pr_err("listmp_put_tail failed! status = 0x%x\n", status);
1036 "status = 0x%x\n", status);
1037 }
1038 return status; 1018 return status;
1039} 1019}
1040 1020
@@ -1121,10 +1101,8 @@ gate_leave_and_exit:
1121 gatemp_leave(obj->gatemp_handle, key); 1101 gatemp_leave(obj->gatemp_handle, key);
1122 1102
1123exit: 1103exit:
1124 if (status < 0) { 1104 if (status < 0)
1125 printk(KERN_ERR "listmp_insert failed! status = 0x%x\n", 1105 pr_err("listmp_insert failed! status = 0x%x\n", status);
1126 status);
1127 }
1128 return status; 1106 return status;
1129} 1107}
1130 1108
@@ -1189,10 +1167,8 @@ gate_leave_and_exit:
1189 gatemp_leave(obj->gatemp_handle, key); 1167 gatemp_leave(obj->gatemp_handle, key);
1190 1168
1191exit: 1169exit:
1192 if (status < 0) { 1170 if (status < 0)
1193 printk(KERN_ERR "listmp_remove failed! status = 0x%x\n", 1171 pr_err("listmp_remove failed! status = 0x%x\n", status);
1194 status);
1195 }
1196 return status; 1172 return status;
1197} 1173}
1198 1174
@@ -1232,7 +1208,7 @@ void *listmp_next(void *listmp_handle, struct listmp_elem *elem)
1232 1208
1233exit: 1209exit:
1234 if (status < 0) 1210 if (status < 0)
1235 printk(KERN_ERR "listmp_next failed! status = 0x%x\n", status); 1211 pr_err("listmp_next failed! status = 0x%x\n", status);
1236 return ret_elem; 1212 return ret_elem;
1237} 1213}
1238 1214
@@ -1272,7 +1248,7 @@ void *listmp_prev(void *listmp_handle, struct listmp_elem *elem)
1272 1248
1273exit: 1249exit:
1274 if (status < 0) 1250 if (status < 0)
1275 printk(KERN_ERR "listmp_prev failed! status = 0x%x\n", status); 1251 pr_err("listmp_prev failed! status = 0x%x\n", status);
1276 return ret_elem; 1252 return ret_elem;
1277} 1253}
1278 1254
@@ -1304,7 +1280,7 @@ uint listmp_shared_mem_req(const struct listmp_params *params)
1304 1280
1305exit: 1281exit:
1306 if (retval < 0) { 1282 if (retval < 0) {
1307 printk(KERN_ERR "listmp_shared_mem_req failed! status = 0x%x\n", 1283 pr_err("listmp_shared_mem_req failed! status = 0x%x\n",
1308 retval); 1284 retval);
1309 } 1285 }
1310 return mem_req; 1286 return mem_req;
@@ -1507,9 +1483,7 @@ error:
1507 } 1483 }
1508 1484
1509exit: 1485exit:
1510 if (status < 0) { 1486 if (status < 0)
1511 printk(KERN_ERR "_listmp_create failed! status = 0x%x\n", 1487 pr_err("_listmp_create failed! status = 0x%x\n", status);
1512 status);
1513 }
1514 return status; 1488 return status;
1515} 1489}
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,
645 return status; 645 return status;
646 646
647exit: 647exit:
648 printk(KERN_ERR "listmp_ioctl failed: status = 0x%x\n", status); 648 pr_err("listmp_ioctl failed: status = 0x%x\n", status);
649 return status; 649 return status;
650} 650}
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)
256 return; 256 return;
257 257
258exit: 258exit:
259 printk(KERN_ERR "messageq_get_config: Argument of type " 259 pr_err("messageq_get_config: Argument of type "
260 "(struct messageq_config *) passed is null!\n"); 260 "(struct messageq_config *) passed is null!\n");
261} 261}
262EXPORT_SYMBOL(messageq_get_config); 262EXPORT_SYMBOL(messageq_get_config);
@@ -315,8 +315,7 @@ int messageq_setup(const struct messageq_config *cfg)
315 if (unlikely(messageq_module->gate_handle == NULL)) { 315 if (unlikely(messageq_module->gate_handle == NULL)) {
316 /*! @retval MESSAGEQ_E_FAIL Failed to create lock! */ 316 /*! @retval MESSAGEQ_E_FAIL Failed to create lock! */
317 status = MESSAGEQ_E_FAIL; 317 status = MESSAGEQ_E_FAIL;
318 printk(KERN_ERR "messageq_setup: Failed to create a " 318 pr_err("messageq_setup: Failed to create a mutex.\n");
319 "mutex.\n");
320 status = -ENOMEM; 319 status = -ENOMEM;
321 goto exit; 320 goto exit;
322 } 321 }
@@ -339,7 +338,7 @@ int messageq_setup(const struct messageq_config *cfg)
339 /*! @retval MESSAGEQ_E_FAIL Failed to create the 338 /*! @retval MESSAGEQ_E_FAIL Failed to create the
340 * MessageQ nameserver*/ 339 * MessageQ nameserver*/
341 status = MESSAGEQ_E_FAIL; 340 status = MESSAGEQ_E_FAIL;
342 printk(KERN_ERR "messageq_setup: Failed to create the messageq" 341 pr_err("messageq_setup: Failed to create the messageq"
343 "nameserver!\n"); 342 "nameserver!\n");
344 goto exit; 343 goto exit;
345 } 344 }
@@ -368,8 +367,7 @@ int messageq_setup(const struct messageq_config *cfg)
368exit: 367exit:
369 if (status < 0) { 368 if (status < 0) {
370 messageq_destroy(); 369 messageq_destroy();
371 printk(KERN_ERR "messageq_setup failed! status = 0x%x\n", 370 pr_err("messageq_setup failed! status = 0x%x\n", status);
372 status);
373 } 371 }
374 return status; 372 return status;
375} 373}
@@ -405,7 +403,7 @@ int messageq_destroy(void)
405 messageq_delete(&(messageq_module->queues[i])); 403 messageq_delete(&(messageq_module->queues[i]));
406 if (unlikely(tmp_status < 0 && status >= 0)) { 404 if (unlikely(tmp_status < 0 && status >= 0)) {
407 status = tmp_status; 405 status = tmp_status;
408 printk(KERN_ERR "messageq_destroy: " 406 pr_err("messageq_destroy: "
409 "messageq_delete failed for queue %d", 407 "messageq_delete failed for queue %d",
410 i); 408 i);
411 } 409 }
@@ -417,8 +415,7 @@ int messageq_destroy(void)
417 tmp_status = nameserver_delete(&messageq_module->ns_handle); 415 tmp_status = nameserver_delete(&messageq_module->ns_handle);
418 if (unlikely(tmp_status < 0 && status >= 0)) { 416 if (unlikely(tmp_status < 0 && status >= 0)) {
419 status = tmp_status; 417 status = tmp_status;
420 printk(KERN_ERR "messageq_destroy: " 418 pr_err("messageq_destroy: nameserver_delete failed");
421 "nameserver_delete failed");
422 } 419 }
423 } 420 }
424 421
@@ -446,10 +443,8 @@ int messageq_destroy(void)
446 atomic_set(&messageq_module->ref_count, MESSAGEQ_MAKE_MAGICSTAMP(0)); 443 atomic_set(&messageq_module->ref_count, MESSAGEQ_MAKE_MAGICSTAMP(0));
447 444
448exit: 445exit:
449 if (status < 0) { 446 if (status < 0)
450 printk(KERN_ERR "messageq_destroy failed! status = 0x%x\n", 447 pr_err("messageq_destroy failed! status = 0x%x\n", status);
451 status);
452 }
453 return status; 448 return status;
454} 449}
455EXPORT_SYMBOL(messageq_destroy); 450EXPORT_SYMBOL(messageq_destroy);
@@ -463,7 +458,7 @@ void messageq_params_init(struct messageq_params *params)
463 MESSAGEQ_MAKE_MAGICSTAMP(1)) == true)) 458 MESSAGEQ_MAKE_MAGICSTAMP(1)) == true))
464 goto exit; 459 goto exit;
465 if (WARN_ON(unlikely(params == NULL))) { 460 if (WARN_ON(unlikely(params == NULL))) {
466 printk(KERN_ERR "messageq_params_init failed:Argument of " 461 pr_err("messageq_params_init failed:Argument of "
467 "type(messageq_params *) is NULL!\n"); 462 "type(messageq_params *) is NULL!\n");
468 goto exit; 463 goto exit;
469 } 464 }
@@ -526,7 +521,7 @@ void *messageq_create(char *name, const struct messageq_params *params)
526 if (unlikely(queueIndex == MESSAGEQ_INVALIDMESSAGEQ)) { 521 if (unlikely(queueIndex == MESSAGEQ_INVALIDMESSAGEQ)) {
527 mutex_unlock(messageq_module->gate_handle); 522 mutex_unlock(messageq_module->gate_handle);
528 status = MESSAGEQ_E_FAIL; 523 status = MESSAGEQ_E_FAIL;
529 printk(KERN_ERR "messageq_create: Failed to grow the " 524 pr_err("messageq_create: Failed to grow the "
530 "queue array!"); 525 "queue array!");
531 goto exit; 526 goto exit;
532 } 527 }
@@ -551,7 +546,7 @@ void *messageq_create(char *name, const struct messageq_params *params)
551 if (unlikely(obj->synchronizer == NULL)) { 546 if (unlikely(obj->synchronizer == NULL)) {
552 mutex_unlock(messageq_module->gate_handle); 547 mutex_unlock(messageq_module->gate_handle);
553 status = MESSAGEQ_E_FAIL; 548 status = MESSAGEQ_E_FAIL;
554 printk(KERN_ERR "messageq_create: Failed to create " 549 pr_err("messageq_create: Failed to create "
555 "synchronizer semaphore!\n"); 550 "synchronizer semaphore!\n");
556 goto exit; 551 goto exit;
557 } else { 552 } else {
@@ -570,7 +565,7 @@ void *messageq_create(char *name, const struct messageq_params *params)
570 name, obj->queue); 565 name, obj->queue);
571 if (unlikely(obj->ns_key == NULL)) { 566 if (unlikely(obj->ns_key == NULL)) {
572 status = MESSAGEQ_E_FAIL; 567 status = MESSAGEQ_E_FAIL;
573 printk(KERN_ERR "messageq_create: Failed to add " 568 pr_err("messageq_create: Failed to add "
574 "the messageq name!\n"); 569 "the messageq name!\n");
575 } 570 }
576 } 571 }
@@ -581,8 +576,7 @@ void *messageq_create(char *name, const struct messageq_params *params)
581exit: 576exit:
582 if (unlikely(status < 0)) { 577 if (unlikely(status < 0)) {
583 messageq_delete((void **)&obj); 578 messageq_delete((void **)&obj);
584 printk(KERN_ERR "messageq_create failed! status = 0x%x\n", 579 pr_err("messageq_create failed! status = 0x%x\n", status);
585 status);
586 } 580 }
587 return (void *) obj; 581 return (void *) obj;
588} 582}
@@ -624,7 +618,7 @@ int messageq_delete(void **msg_handleptr)
624 status = nameserver_remove_entry(messageq_module->ns_handle, 618 status = nameserver_remove_entry(messageq_module->ns_handle,
625 obj->ns_key); 619 obj->ns_key);
626 if (unlikely(status < 0)) { 620 if (unlikely(status < 0)) {
627 printk(KERN_ERR "messageq_delete: nameserver_remove_" 621 pr_err("messageq_delete: nameserver_remove_"
628 "entry failed! status = 0x%x", status); 622 "entry failed! status = 0x%x", status);
629 } 623 }
630 } 624 }
@@ -640,7 +634,7 @@ int messageq_delete(void **msg_handleptr)
640 tmp_status = messageq_free(temp_msg); 634 tmp_status = messageq_free(temp_msg);
641 if (unlikely((tmp_status < 0) && (status >= 0))) { 635 if (unlikely((tmp_status < 0) && (status >= 0))) {
642 status = tmp_status; 636 status = tmp_status;
643 printk(KERN_ERR "messageq_delete: messageq_free failed" 637 pr_err("messageq_delete: messageq_free failed"
644 " for normal_list!"); 638 " for normal_list!");
645 } 639 }
646 } 640 }
@@ -657,7 +651,7 @@ int messageq_delete(void **msg_handleptr)
657 tmp_status = messageq_free(temp_msg); 651 tmp_status = messageq_free(temp_msg);
658 if (unlikely((tmp_status < 0) && (status >= 0))) { 652 if (unlikely((tmp_status < 0) && (status >= 0))) {
659 status = tmp_status; 653 status = tmp_status;
660 printk(KERN_ERR "messageq_delete: messageq_free failed" 654 pr_err("messageq_delete: messageq_free failed"
661 " for high_list!"); 655 " for high_list!");
662 } 656 }
663 } 657 }
@@ -680,10 +674,8 @@ int messageq_delete(void **msg_handleptr)
680 *msg_handleptr = NULL; 674 *msg_handleptr = NULL;
681 675
682exit: 676exit:
683 if (status < 0) { 677 if (status < 0)
684 printk(KERN_ERR "messageq_delete failed! status = 0x%x\n", 678 pr_err("messageq_delete failed! status = 0x%x\n", status);
685 status);;
686 }
687 return status; 679 return status;
688} 680}
689EXPORT_SYMBOL(messageq_delete); 681EXPORT_SYMBOL(messageq_delete);
@@ -715,10 +707,8 @@ int messageq_open(char *name, u32 *queue_id)
715 queue_id, NULL); 707 queue_id, NULL);
716 708
717exit: 709exit:
718 if (status < 0) { 710 if (status < 0)
719 printk(KERN_ERR "messageq_open failed! status = 0x%x\n", 711 pr_err("messageq_open failed! status = 0x%x\n", status);
720 status);
721 }
722 return status; 712 return status;
723} 713}
724EXPORT_SYMBOL(messageq_open); 714EXPORT_SYMBOL(messageq_open);
@@ -736,7 +726,7 @@ int messageq_close(u32 *queue_id)
736 goto exit; 726 goto exit;
737 } 727 }
738 if (WARN_ON(unlikely(queue_id == NULL))) { 728 if (WARN_ON(unlikely(queue_id == NULL))) {
739 printk(KERN_ERR "messageq_close: queue_id passed is NULL!\n"); 729 pr_err("messageq_close: queue_id passed is NULL!\n");
740 status = -EINVAL; 730 status = -EINVAL;
741 goto exit; 731 goto exit;
742 } 732 }
@@ -744,10 +734,8 @@ int messageq_close(u32 *queue_id)
744 *queue_id = MESSAGEQ_INVALIDMESSAGEQ; 734 *queue_id = MESSAGEQ_INVALIDMESSAGEQ;
745 735
746exit: 736exit:
747 if (status < 0) { 737 if (status < 0)
748 printk(KERN_ERR "messageq_close failed! status = 0x%x\n", 738 pr_err("messageq_close failed! status = 0x%x\n", status);
749 status);
750 }
751 return status; 739 return status;
752} 740}
753EXPORT_SYMBOL(messageq_close); 741EXPORT_SYMBOL(messageq_close);
@@ -842,12 +830,12 @@ exit:
842 if (unlikely((messageq_module->cfg.trace_flag == true) && \ 830 if (unlikely((messageq_module->cfg.trace_flag == true) && \
843 ((*msg != NULL) && \ 831 ((*msg != NULL) && \
844 (((*msg)->flags & MESSAGEQ_TRACEMASK) != 0)))) { 832 (((*msg)->flags & MESSAGEQ_TRACEMASK) != 0)))) {
845 printk(KERN_INFO "messageq_get: *msg = 0x%x seq_num = 0x%x " 833 pr_info("messageq_get: *msg = 0x%x seq_num = 0x%x "
846 "src_proc = 0x%x obj = 0x%x\n", (uint)(*msg), 834 "src_proc = 0x%x obj = 0x%x\n", (uint)(*msg),
847 ((*msg)->seq_num), ((*msg)->src_proc), (uint)(obj)); 835 ((*msg)->seq_num), ((*msg)->src_proc), (uint)(obj));
848 } 836 }
849 if (status < 0 && status != -ETIME) 837 if (status < 0 && status != -ETIME)
850 printk(KERN_ERR "messageq_get failed! status = 0x%x\n", status); 838 pr_err("messageq_get failed! status = 0x%x\n", status);
851 return status; 839 return status;
852} 840}
853EXPORT_SYMBOL(messageq_get); 841EXPORT_SYMBOL(messageq_get);
@@ -870,7 +858,7 @@ int messageq_count(void *messageq_handle)
870 } 858 }
871 if (WARN_ON(obj == NULL)) { 859 if (WARN_ON(obj == NULL)) {
872 status = -EINVAL; 860 status = -EINVAL;
873 printk(KERN_ERR "messageq_count: obj passed is NULL!\n"); 861 pr_err("messageq_count: obj passed is NULL!\n");
874 goto exit; 862 goto exit;
875 } 863 }
876 864
@@ -888,7 +876,7 @@ int messageq_count(void *messageq_handle)
888 876
889exit: 877exit:
890 if (status < 0) 878 if (status < 0)
891 printk(KERN_ERR "messageq_count failed! status = 0x%x", status); 879 pr_err("messageq_count failed! status = 0x%x", status);
892 return count; 880 return count;
893} 881}
894EXPORT_SYMBOL(messageq_count); 882EXPORT_SYMBOL(messageq_count);
@@ -906,7 +894,7 @@ void messageq_static_msg_init(messageq_msg msg, u32 size)
906 goto exit; 894 goto exit;
907 } 895 }
908 if (WARN_ON(msg == NULL)) { 896 if (WARN_ON(msg == NULL)) {
909 printk(KERN_ERR "messageq_static_msg_init: msg is invalid!\n"); 897 pr_err("messageq_static_msg_init: msg is invalid!\n");
910 goto exit; 898 goto exit;
911 } 899 }
912 900
@@ -917,14 +905,14 @@ void messageq_static_msg_init(messageq_msg msg, u32 size)
917 905
918 if (unlikely((messageq_module->cfg.trace_flag == true) || \ 906 if (unlikely((messageq_module->cfg.trace_flag == true) || \
919 (((*msg).flags & MESSAGEQ_TRACEMASK) != 0))) { 907 (((*msg).flags & MESSAGEQ_TRACEMASK) != 0))) {
920 printk(KERN_INFO "messageq_static_msg_init: msg = 0x%x " 908 pr_info("messageq_static_msg_init: msg = 0x%x "
921 "seq_num = 0x%x src_proc = 0x%x", (uint)(msg), 909 "seq_num = 0x%x src_proc = 0x%x", (uint)(msg),
922 (msg)->seq_num, (msg)->src_proc); 910 (msg)->seq_num, (msg)->src_proc);
923 } 911 }
924 912
925exit: 913exit:
926 if (status < 0) { 914 if (status < 0) {
927 printk(KERN_ERR "messageq_static_msg_init failed! " 915 pr_err("messageq_static_msg_init failed! "
928 "status = 0x%x", status); 916 "status = 0x%x", status);
929 } 917 }
930 return; 918 return;
@@ -969,14 +957,14 @@ messageq_msg messageq_alloc(u16 heap_id, u32 size)
969 957
970 if (unlikely((messageq_module->cfg.trace_flag == true) || \ 958 if (unlikely((messageq_module->cfg.trace_flag == true) || \
971 (((*msg).flags & MESSAGEQ_TRACEMASK) != 0))) { 959 (((*msg).flags & MESSAGEQ_TRACEMASK) != 0))) {
972 printk(KERN_INFO "messageq_alloc: msg = 0x%x seq_num = 0x%x " 960 pr_info("messageq_alloc: msg = 0x%x seq_num = 0x%x "
973 "src_proc = 0x%x", (uint)(msg), (msg)->seq_num, 961 "src_proc = 0x%x", (uint)(msg), (msg)->seq_num,
974 (msg)->src_proc); 962 (msg)->src_proc);
975 } 963 }
976 964
977exit: 965exit:
978 if (status < 0) 966 if (status < 0)
979 printk(KERN_ERR "messageq_alloc failed! status = 0x%x", status); 967 pr_err("messageq_alloc failed! status = 0x%x", status);
980 return msg; 968 return msg;
981} 969}
982EXPORT_SYMBOL(messageq_alloc); 970EXPORT_SYMBOL(messageq_alloc);
@@ -1013,7 +1001,7 @@ int messageq_free(messageq_msg msg)
1013 1001
1014 if (unlikely((messageq_module->cfg.trace_flag == true) || \ 1002 if (unlikely((messageq_module->cfg.trace_flag == true) || \
1015 (((*msg).flags & MESSAGEQ_TRACEMASK) != 0))) { 1003 (((*msg).flags & MESSAGEQ_TRACEMASK) != 0))) {
1016 printk(KERN_INFO "messageq_free: msg = 0x%x seq_num = 0x%x " 1004 pr_info("messageq_free: msg = 0x%x seq_num = 0x%x "
1017 "src_proc = 0x%x", (uint)(msg), (msg)->seq_num, 1005 "src_proc = 0x%x", (uint)(msg), (msg)->seq_num,
1018 (msg)->src_proc); 1006 (msg)->src_proc);
1019 } 1007 }
@@ -1021,10 +1009,8 @@ int messageq_free(messageq_msg msg)
1021 sl_heap_free(heap, msg, msg->msg_size); 1009 sl_heap_free(heap, msg, msg->msg_size);
1022 1010
1023exit: 1011exit:
1024 if (status < 0) { 1012 if (status < 0)
1025 printk(KERN_ERR "messageq_free failed! status = 0x%x\n", 1013 pr_err("messageq_free failed! status = 0x%x\n", status);
1026 status);
1027 }
1028 return status; 1014 return status;
1029} 1015}
1030EXPORT_SYMBOL(messageq_free); 1016EXPORT_SYMBOL(messageq_free);
@@ -1115,14 +1101,14 @@ int messageq_put(u32 queue_id, messageq_msg msg)
1115 } 1101 }
1116 if (unlikely((messageq_module->cfg.trace_flag == true) || \ 1102 if (unlikely((messageq_module->cfg.trace_flag == true) || \
1117 (((*msg).flags & MESSAGEQ_TRACEMASK) != 0))) { 1103 (((*msg).flags & MESSAGEQ_TRACEMASK) != 0))) {
1118 printk(KERN_INFO "messageq_put: msg = 0x%x seq_num = 0x%x " 1104 pr_info("messageq_put: msg = 0x%x seq_num = 0x%x "
1119 "src_proc = 0x%x dst_proc_id = 0x%x\n", (uint)(msg), 1105 "src_proc = 0x%x dst_proc_id = 0x%x\n", (uint)(msg),
1120 (msg)->seq_num, (msg)->src_proc, (msg)->dst_proc); 1106 (msg)->seq_num, (msg)->src_proc, (msg)->dst_proc);
1121 } 1107 }
1122 1108
1123exit: 1109exit:
1124 if (status < 0) 1110 if (status < 0)
1125 printk(KERN_ERR "messageq_put failed! status = 0x%x\n", status); 1111 pr_err("messageq_put failed! status = 0x%x\n", status);
1126 return status; 1112 return status;
1127} 1113}
1128EXPORT_SYMBOL(messageq_put); 1114EXPORT_SYMBOL(messageq_put);
@@ -1165,7 +1151,7 @@ int messageq_register_heap(void *heap_handle, u16 heap_id)
1165 1151
1166exit: 1152exit:
1167 if (status < 0) { 1153 if (status < 0) {
1168 printk(KERN_ERR "messageq_register_heap failed! " 1154 pr_err("messageq_register_heap failed! "
1169 "status = 0x%x\n", status); 1155 "status = 0x%x\n", status);
1170 } 1156 }
1171 return status; 1157 return status;
@@ -1200,7 +1186,7 @@ int messageq_unregister_heap(u16 heap_id)
1200 1186
1201exit: 1187exit:
1202 if (status < 0) { 1188 if (status < 0) {
1203 printk(KERN_ERR "messageq_unregister_heap failed! " 1189 pr_err("messageq_unregister_heap failed! "
1204 "status = 0x%x\n", status); 1190 "status = 0x%x\n", status);
1205 } 1191 }
1206 return status; 1192 return status;
@@ -1274,7 +1260,7 @@ int messageq_register_transport(void *messageq_transportshm_handle,
1274 1260
1275exit: 1261exit:
1276 if (status < 0) { 1262 if (status < 0) {
1277 printk(KERN_ERR "messageq_register_transport failed! " 1263 pr_err("messageq_register_transport failed! "
1278 "status = 0x%x\n", status); 1264 "status = 0x%x\n", status);
1279 } 1265 }
1280 return status; 1266 return status;
@@ -1308,7 +1294,7 @@ void messageq_unregister_transport(u16 proc_id, u32 priority)
1308 1294
1309exit: 1295exit:
1310 if (status < 0) { 1296 if (status < 0) {
1311 printk(KERN_ERR "messageq_unregister_transport failed! " 1297 pr_err("messageq_unregister_transport failed! "
1312 "status = 0x%x\n", status); 1298 "status = 0x%x\n", status);
1313 } 1299 }
1314 return; 1300 return;
@@ -1337,8 +1323,7 @@ void messageq_set_reply_queue(void *messageq_handle, messageq_msg msg)
1337 return; 1323 return;
1338 1324
1339exit: 1325exit:
1340 printk(KERN_ERR "messageq_set_reply_queue failed: status = 0x%x", 1326 pr_err("messageq_set_reply_queue failed: status = 0x%x", status);
1341 status);
1342 return; 1327 return;
1343} 1328}
1344EXPORT_SYMBOL(messageq_set_reply_queue); 1329EXPORT_SYMBOL(messageq_set_reply_queue);
@@ -1351,7 +1336,7 @@ u32 messageq_get_queue_id(void *messageq_handle)
1351 u32 queue_id = MESSAGEQ_INVALIDMESSAGEQ; 1336 u32 queue_id = MESSAGEQ_INVALIDMESSAGEQ;
1352 1337
1353 if (WARN_ON(unlikely(obj == NULL))) { 1338 if (WARN_ON(unlikely(obj == NULL))) {
1354 printk(KERN_ERR "messageq_get_queue_id: obj passed is NULL!\n"); 1339 pr_err("messageq_get_queue_id: obj passed is NULL!\n");
1355 goto exit; 1340 goto exit;
1356 } 1341 }
1357 1342
@@ -1370,7 +1355,7 @@ u16 messageq_get_proc_id(void *messageq_handle)
1370 u16 proc_id = MULTIPROC_INVALIDID; 1355 u16 proc_id = MULTIPROC_INVALIDID;
1371 1356
1372 if (WARN_ON(unlikely(obj == NULL))) { 1357 if (WARN_ON(unlikely(obj == NULL))) {
1373 printk(KERN_ERR "messageq_get_proc_id: obj passed is NULL!\n"); 1358 pr_err("messageq_get_proc_id: obj passed is NULL!\n");
1374 goto exit; 1359 goto exit;
1375 } 1360 }
1376 1361
@@ -1387,8 +1372,7 @@ u32 messageq_get_dst_queue(messageq_msg msg)
1387 u32 queue_id = MESSAGEQ_INVALIDMESSAGEQ; 1372 u32 queue_id = MESSAGEQ_INVALIDMESSAGEQ;
1388 1373
1389 if (WARN_ON(unlikely(msg == NULL))) { 1374 if (WARN_ON(unlikely(msg == NULL))) {
1390 printk(KERN_ERR "messageq_get_dst_queue: msg passed is " 1375 pr_err("messageq_get_dst_queue: msg passed is NULL!\n");
1391 "NULL!\n");
1392 goto exit; 1376 goto exit;
1393 } 1377 }
1394 1378
@@ -1407,7 +1391,7 @@ u16 messageq_get_msg_id(messageq_msg msg)
1407 u16 id = MESSAGEQ_INVALIDMSGID; 1391 u16 id = MESSAGEQ_INVALIDMSGID;
1408 1392
1409 if (WARN_ON(unlikely(msg == NULL))) { 1393 if (WARN_ON(unlikely(msg == NULL))) {
1410 printk(KERN_ERR "messageq_get_msg_id: msg passed is NULL!\n"); 1394 pr_err("messageq_get_msg_id: msg passed is NULL!\n");
1411 goto exit; 1395 goto exit;
1412 } 1396 }
1413 1397
@@ -1424,7 +1408,7 @@ u32 messageq_get_msg_size(messageq_msg msg)
1424 u32 size = 0; 1408 u32 size = 0;
1425 1409
1426 if (WARN_ON(unlikely(msg == NULL))) { 1410 if (WARN_ON(unlikely(msg == NULL))) {
1427 printk(KERN_ERR "messageq_get_msg_size: msg passed is NULL!\n"); 1411 pr_err("messageq_get_msg_size: msg passed is NULL!\n");
1428 goto exit; 1412 goto exit;
1429 } 1413 }
1430 1414
@@ -1441,7 +1425,7 @@ u32 messageq_get_msg_pri(messageq_msg msg)
1441 u32 priority = MESSAGEQ_NORMALPRI; 1425 u32 priority = MESSAGEQ_NORMALPRI;
1442 1426
1443 if (WARN_ON(unlikely(msg == NULL))) { 1427 if (WARN_ON(unlikely(msg == NULL))) {
1444 printk(KERN_ERR "messageq_get_msg_pri: msg passed is NULL!\n"); 1428 pr_err("messageq_get_msg_pri: msg passed is NULL!\n");
1445 goto exit; 1429 goto exit;
1446 } 1430 }
1447 1431
@@ -1458,8 +1442,7 @@ u32 messageq_get_reply_queue(messageq_msg msg)
1458 u32 queue = MESSAGEQ_INVALIDMESSAGEQ; 1442 u32 queue = MESSAGEQ_INVALIDMESSAGEQ;
1459 1443
1460 if (WARN_ON(unlikely(msg == NULL))) { 1444 if (WARN_ON(unlikely(msg == NULL))) {
1461 printk(KERN_ERR "messageq_get_reply_queue: msg passed is " 1445 pr_err("messageq_get_reply_queue: msg passed is NULL!\n");
1462 "NULL!\n");
1463 goto exit; 1446 goto exit;
1464 } 1447 }
1465 1448
@@ -1475,7 +1458,7 @@ EXPORT_SYMBOL(messageq_get_reply_queue);
1475void messageq_set_msg_id(messageq_msg msg, u16 msg_id) 1458void messageq_set_msg_id(messageq_msg msg, u16 msg_id)
1476{ 1459{
1477 if (WARN_ON(unlikely(msg == NULL))) { 1460 if (WARN_ON(unlikely(msg == NULL))) {
1478 printk(KERN_ERR "messageq_set_msg_id: msg passed is NULL!\n"); 1461 pr_err("messageq_set_msg_id: msg passed is NULL!\n");
1479 goto exit; 1462 goto exit;
1480 } 1463 }
1481 1464
@@ -1490,7 +1473,7 @@ EXPORT_SYMBOL(messageq_set_msg_id);
1490void messageq_set_msg_pri(messageq_msg msg, u32 priority) 1473void messageq_set_msg_pri(messageq_msg msg, u32 priority)
1491{ 1474{
1492 if (WARN_ON(unlikely(msg == NULL))) { 1475 if (WARN_ON(unlikely(msg == NULL))) {
1493 printk(KERN_ERR "messageq_set_msg_pri: msg passed is NULL!\n"); 1476 pr_err("messageq_set_msg_pri: msg passed is NULL!\n");
1494 goto exit; 1477 goto exit;
1495 } 1478 }
1496 1479
@@ -1505,15 +1488,14 @@ EXPORT_SYMBOL(messageq_set_msg_pri);
1505void messageq_set_msg_trace(messageq_msg msg, bool trace_flag) 1488void messageq_set_msg_trace(messageq_msg msg, bool trace_flag)
1506{ 1489{
1507 if (WARN_ON(unlikely(msg == NULL))) { 1490 if (WARN_ON(unlikely(msg == NULL))) {
1508 printk(KERN_ERR "messageq_set_msg_trace: msg passed is " 1491 pr_err("messageq_set_msg_trace: msg passed is NULL!\n");
1509 "NULL!\n");
1510 goto exit; 1492 goto exit;
1511 } 1493 }
1512 1494
1513 msg->flags = (msg->flags & ~MESSAGEQ_TRACEMASK) | \ 1495 msg->flags = (msg->flags & ~MESSAGEQ_TRACEMASK) | \
1514 (trace_flag << MESSAGEQ_TRACESHIFT); 1496 (trace_flag << MESSAGEQ_TRACESHIFT);
1515 1497
1516 printk(KERN_INFO "messageq_set_msg_trace: msg = 0x%x, seq_num = 0x%x" 1498 pr_info("messageq_set_msg_trace: msg = 0x%x, seq_num = 0x%x"
1517 "src_proc = 0x%x trace_flag = 0x%x", (uint)msg, 1499 "src_proc = 0x%x trace_flag = 0x%x", (uint)msg,
1518 msg->seq_num, msg->src_proc, trace_flag); 1500 msg->seq_num, msg->src_proc, trace_flag);
1519exit: 1501exit:
@@ -1553,7 +1535,7 @@ int messageq_attach(u16 remote_proc_id, void *shared_addr)
1553 status = messageq_setup_transport_proxy_attach( 1535 status = messageq_setup_transport_proxy_attach(
1554 remote_proc_id, shared_addr); 1536 remote_proc_id, shared_addr);
1555 if (status < 0) { 1537 if (status < 0) {
1556 printk(KERN_ERR "messageq_attach failed in transport" 1538 pr_err("messageq_attach failed in transport"
1557 "setup, status = 0x%x", status); 1539 "setup, status = 0x%x", status);
1558 } 1540 }
1559 } 1541 }
@@ -1573,7 +1555,7 @@ int messageq_detach(u16 remote_proc_id)
1573 * transports */ 1555 * transports */
1574 status = messageq_setup_transport_proxy_detach(remote_proc_id); 1556 status = messageq_setup_transport_proxy_detach(remote_proc_id);
1575 if (unlikely(status < 0)) { 1557 if (unlikely(status < 0)) {
1576 printk(KERN_ERR "messageq_detach failed in transport" 1558 pr_err("messageq_detach failed in transport"
1577 "detach, status = 0x%x", status); 1559 "detach, status = 0x%x", status);
1578 } 1560 }
1579 } 1561 }
@@ -1601,8 +1583,7 @@ static u16 _messageq_grow(struct messageq_object *obj)
1601 queues = kmalloc(old_size + sizeof(struct messageq_object *), 1583 queues = kmalloc(old_size + sizeof(struct messageq_object *),
1602 GFP_KERNEL); 1584 GFP_KERNEL);
1603 if (queues == NULL) { 1585 if (queues == NULL) {
1604 printk(KERN_ERR "_messageq_grow: Growing the messageq " 1586 pr_err("_messageq_grow: Growing the messageq failed!\n");
1605 "failed!\n");
1606 goto exit; 1587 goto exit;
1607 } 1588 }
1608 1589
@@ -1656,9 +1637,7 @@ static void messageq_msg_init(messageq_msg msg)
1656 mutex_unlock(messageq_module->gate_handle); 1637 mutex_unlock(messageq_module->gate_handle);
1657 1638
1658exit: 1639exit:
1659 if (status < 0) { 1640 if (status < 0)
1660 printk(KERN_ERR "messageq_msg_init: Invalid NULL msg " 1641 pr_err("messageq_msg_init: Invalid NULL msg specified!\n");
1661 "specified!\n");
1662 }
1663 return; 1642 return;
1664} 1643}
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,
730 return status; 730 return status;
731 731
732exit: 732exit:
733 printk(KERN_ERR "messageq_ioctl failed: status = 0x%x\n", status); 733 pr_err("messageq_ioctl failed: status = 0x%x\n", status);
734 return status; 734 return status;
735} 735}
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)
257 } 257 }
258 258
259exit: 259exit:
260 if (retval < 0) { 260 if (retval < 0)
261 printk(KERN_ERR "nameserver_get_config failed! retval = 0x%x", 261 pr_err("nameserver_get_config failed! retval = 0x%x", retval);
262 retval);
263 }
264 return; 262 return;
265} 263}
266EXPORT_SYMBOL(nameserver_get_config); 264EXPORT_SYMBOL(nameserver_get_config);
@@ -310,7 +308,7 @@ int nameserver_setup(void)
310remote_alloc_fail: 308remote_alloc_fail:
311 kfree(nameserver_module->mod_gate_handle); 309 kfree(nameserver_module->mod_gate_handle);
312exit: 310exit:
313 printk(KERN_ERR "nameserver_setup failed, retval: %x\n", retval); 311 pr_err("nameserver_setup failed, retval: %x\n", retval);
314 return retval; 312 return retval;
315} 313}
316EXPORT_SYMBOL(nameserver_setup); 314EXPORT_SYMBOL(nameserver_setup);
@@ -359,10 +357,8 @@ int nameserver_destroy(void)
359 return 0; 357 return 0;
360 358
361exit: 359exit:
362 if (retval < 0) { 360 if (retval < 0)
363 printk(KERN_ERR "nameserver_destroy failed, retval: %x\n", 361 pr_err("nameserver_destroy failed, retval: %x\n", retval);
364 retval);
365 }
366 return retval; 362 return retval;
367} 363}
368EXPORT_SYMBOL(nameserver_destroy); 364EXPORT_SYMBOL(nameserver_destroy);
@@ -389,10 +385,8 @@ void nameserver_params_init(struct nameserver_params *params)
389 sizeof(struct nameserver_params)); 385 sizeof(struct nameserver_params));
390 386
391exit: 387exit:
392 if (retval < 0) { 388 if (retval < 0)
393 printk(KERN_ERR "nameserver_params_init failed! status = 0x%x", 389 pr_err("nameserver_params_init failed! status = 0x%x", retval);
394 retval);
395 }
396 return; 390 return;
397} 391}
398EXPORT_SYMBOL(nameserver_params_init); 392EXPORT_SYMBOL(nameserver_params_init);
@@ -479,7 +473,7 @@ error:
479error_handle: 473error_handle:
480 mutex_unlock(nameserver_module->mod_gate_handle); 474 mutex_unlock(nameserver_module->mod_gate_handle);
481exit: 475exit:
482 printk(KERN_ERR "nameserver_create failed retval:%x\n", retval); 476 pr_err("nameserver_create failed retval:%x\n", retval);
483 return NULL; 477 return NULL;
484} 478}
485EXPORT_SYMBOL(nameserver_create); 479EXPORT_SYMBOL(nameserver_create);
@@ -567,10 +561,8 @@ void nameserver_construct(void *handle, const char *name,
567 mutex_unlock(nameserver_module->mod_gate_handle); 561 mutex_unlock(nameserver_module->mod_gate_handle);
568 562
569exit: 563exit:
570 if (retval < 0) { 564 if (retval < 0)
571 printk(KERN_ERR "nameserver_construct failed! retval = 0x%x", 565 pr_err("nameserver_construct failed! retval = 0x%x", retval);
572 retval);
573 }
574 return; 566 return;
575} 567}
576 568
@@ -636,7 +628,7 @@ int nameserver_delete(void **handle)
636error: 628error:
637 mutex_unlock(gate_handle); 629 mutex_unlock(gate_handle);
638exit: 630exit:
639 printk(KERN_ERR "nameserver_delete failed retval:%x\n", retval); 631 pr_err("nameserver_delete failed retval:%x\n", retval);
640 return retval; 632 return retval;
641} 633}
642EXPORT_SYMBOL(nameserver_delete); 634EXPORT_SYMBOL(nameserver_delete);
@@ -703,7 +695,7 @@ error:
703 mutex_unlock(obj->gate_handle); 695 mutex_unlock(obj->gate_handle);
704 696
705exit: 697exit:
706 printk(KERN_ERR "nameserver_destruct failed! status = 0x%x", retval); 698 pr_err("nameserver_destruct failed! status = 0x%x", retval);
707 return; 699 return;
708} 700}
709 701
@@ -814,7 +806,7 @@ error_name:
814error: 806error:
815 mutex_unlock(temp_obj->gate_handle); 807 mutex_unlock(temp_obj->gate_handle);
816exit: 808exit:
817 printk(KERN_ERR "nameserver_add failed status: %x\n", retval); 809 pr_err("nameserver_add failed status: %x\n", retval);
818 return NULL; 810 return NULL;
819} 811}
820EXPORT_SYMBOL(nameserver_add); 812EXPORT_SYMBOL(nameserver_add);
@@ -846,7 +838,7 @@ void *nameserver_add_uint32(void *handle, const char *name,
846 838
847exit: 839exit:
848 if (retval < 0 || new_node == NULL) { 840 if (retval < 0 || new_node == NULL) {
849 printk(KERN_ERR "nameserver_add_uint32 failed! status = 0x%x " 841 pr_err("nameserver_add_uint32 failed! status = 0x%x "
850 "new_node = 0x%x", retval, (u32)new_node); 842 "new_node = 0x%x", retval, (u32)new_node);
851 } 843 }
852 return new_node; 844 return new_node;
@@ -947,7 +939,7 @@ int nameserver_remove(void *handle, const char *name)
947error: 939error:
948 mutex_unlock(temp_obj->gate_handle); 940 mutex_unlock(temp_obj->gate_handle);
949exit: 941exit:
950 printk(KERN_ERR "nameserver_remove failed status:%x\n", retval); 942 pr_err("nameserver_remove failed status:%x\n", retval);
951 return retval; 943 return retval;
952} 944}
953EXPORT_SYMBOL(nameserver_remove); 945EXPORT_SYMBOL(nameserver_remove);
@@ -990,7 +982,7 @@ int nameserver_remove_entry(void *nshandle, void *nsentry)
990 return 0; 982 return 0;
991 983
992exit: 984exit:
993 printk(KERN_ERR "nameserver_remove_entry failed status:%x\n", retval); 985 pr_err("nameserver_remove_entry failed status:%x\n", retval);
994 return retval; 986 return retval;
995} 987}
996EXPORT_SYMBOL(nameserver_remove_entry); 988EXPORT_SYMBOL(nameserver_remove_entry);
@@ -1071,7 +1063,7 @@ error:
1071 1063
1072exit: 1064exit:
1073 if (retval < 0) 1065 if (retval < 0)
1074 printk(KERN_ERR "nameserver_get_local entry not found!\n"); 1066 pr_err("nameserver_get_local entry not found!\n");
1075 return retval; 1067 return retval;
1076} 1068}
1077EXPORT_SYMBOL(nameserver_get_local); 1069EXPORT_SYMBOL(nameserver_get_local);
@@ -1163,7 +1155,7 @@ int nameserver_get(void *handle, const char *name,
1163 1155
1164exit: 1156exit:
1165 if (retval < 0) 1157 if (retval < 0)
1166 printk(KERN_ERR "nameserver_get failed: status=%x\n", retval); 1158 pr_err("nameserver_get failed: status=%x\n", retval);
1167 return retval; 1159 return retval;
1168} 1160}
1169EXPORT_SYMBOL(nameserver_get); 1161EXPORT_SYMBOL(nameserver_get);
@@ -1200,10 +1192,8 @@ int nameserver_get_uint32(void *handle, const char *name, void *value,
1200 1192
1201exit: 1193exit:
1202 /* -ENOENT is a valid run-time failure. */ 1194 /* -ENOENT is a valid run-time failure. */
1203 if ((retval < 0) && (retval != -ENOENT)) { 1195 if ((retval < 0) && (retval != -ENOENT))
1204 printk(KERN_ERR "nameserver_get_uint32 failed! status = 0x%x", 1196 pr_err("nameserver_get_uint32 failed! status = 0x%x", retval);
1205 retval);
1206 }
1207 return retval; 1197 return retval;
1208} 1198}
1209EXPORT_SYMBOL(nameserver_get_uint32); 1199EXPORT_SYMBOL(nameserver_get_uint32);
@@ -1248,7 +1238,7 @@ int nameserver_get_local_uint32(void *handle, const char *name, void *value)
1248exit: 1238exit:
1249 /* -ENOENT is a valid run-time failure. */ 1239 /* -ENOENT is a valid run-time failure. */
1250 if ((retval < 0) && (retval != -ENOENT)) { 1240 if ((retval < 0) && (retval != -ENOENT)) {
1251 printk(KERN_ERR "nameserver_get_local_uint32 failed! " 1241 pr_err("nameserver_get_local_uint32 failed! "
1252 "status = 0x%x", retval); 1242 "status = 0x%x", retval);
1253 } 1243 }
1254 return retval; 1244 return retval;
@@ -1310,7 +1300,7 @@ int nameserver_match(void *handle, const char *name, u32 *value)
1310 1300
1311exit: 1301exit:
1312 if (retval < 0) 1302 if (retval < 0)
1313 printk(KERN_ERR "nameserver_match failed status:%x\n", retval); 1303 pr_err("nameserver_match failed status:%x\n", retval);
1314 return found_len; 1304 return found_len;
1315} 1305}
1316EXPORT_SYMBOL(nameserver_match); 1306EXPORT_SYMBOL(nameserver_match);
@@ -1347,7 +1337,7 @@ void *nameserver_get_handle(const char *name)
1347 return (void *)obj; 1337 return (void *)obj;
1348 1338
1349exit: 1339exit:
1350 printk(KERN_ERR "nameserver_get_handle failed! status = 0x%x", retval); 1340 pr_err("nameserver_get_handle failed! status = 0x%x", retval);
1351 return (void *)NULL; 1341 return (void *)NULL;
1352} 1342}
1353EXPORT_SYMBOL(nameserver_get_handle); 1343EXPORT_SYMBOL(nameserver_get_handle);
@@ -1385,7 +1375,7 @@ int nameserver_register_remote_driver(void *handle, u16 proc_id)
1385 return 0; 1375 return 0;
1386 1376
1387exit: 1377exit:
1388 printk(KERN_ERR "nameserver_register_remote_driver failed! " 1378 pr_err("nameserver_register_remote_driver failed! "
1389 "status:%x\n", retval); 1379 "status:%x\n", retval);
1390 return retval; 1380 return retval;
1391} 1381}
@@ -1415,7 +1405,7 @@ int nameserver_unregister_remote_driver(u16 proc_id)
1415 return 0; 1405 return 0;
1416 1406
1417exit: 1407exit:
1418 printk(KERN_ERR "nameserver_unregister_remote_driver failed! " 1408 pr_err("nameserver_unregister_remote_driver failed! "
1419 "status:%x\n", retval); 1409 "status:%x\n", retval);
1420 return retval; 1410 return retval;
1421} 1411}
@@ -1443,7 +1433,7 @@ bool nameserver_is_registered(u16 proc_id)
1443 1433
1444exit: 1434exit:
1445 if (retval < 0) { 1435 if (retval < 0) {
1446 printk(KERN_ERR "nameserver_is_registered failed! " 1436 pr_err("nameserver_is_registered failed! "
1447 "status = 0x%x", retval); 1437 "status = 0x%x", retval);
1448 } 1438 }
1449 return registered; 1439 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,
40 name, value, value_len, NULL); 40 name, value, value_len, NULL);
41 41
42exit: 42exit:
43 if (retval < 0) { 43 if (retval < 0)
44 printk(KERN_ERR "nameserver_remote_get failed! status = 0x%x", 44 pr_err("nameserver_remote_get failed! status = 0x%x", retval);
45 retval);
46 }
47 return retval; 45 return retval;
48} 46}
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(
151 151
152exit: 152exit:
153 if (retval < 0) { 153 if (retval < 0) {
154 printk(KERN_ERR "nameserver_remotenotify_get_config failed!" 154 pr_err("nameserver_remotenotify_get_config failed!"
155 " retval = 0x%x", retval); 155 " retval = 0x%x", retval);
156 } 156 }
157 return; 157 return;
@@ -212,7 +212,7 @@ int nameserver_remotenotify_setup(struct nameserver_remotenotify_config *cfg)
212 return 0; 212 return 0;
213 213
214exit: 214exit:
215 printk(KERN_ERR "nameserver_remotenotify_setup failed! retval = 0x%x", 215 pr_err("nameserver_remotenotify_setup failed! retval = 0x%x",
216 retval); 216 retval);
217 return retval; 217 return retval;
218} 218}
@@ -248,7 +248,7 @@ int nameserver_remotenotify_destroy(void)
248 return 0; 248 return 0;
249 249
250exit: 250exit:
251 printk(KERN_ERR "nameserver_remotenotify_destroy failed! retval = 0x%x", 251 pr_err("nameserver_remotenotify_destroy failed! retval = 0x%x",
252 retval); 252 retval);
253 return retval; 253 return retval;
254} 254}
@@ -262,13 +262,13 @@ void nameserver_remotenotify_params_init(
262 &(nameserver_remotenotify_state.ref_count), 262 &(nameserver_remotenotify_state.ref_count),
263 NAMESERVERREMOTENOTIFY_MAKE_MAGICSTAMP(0), 263 NAMESERVERREMOTENOTIFY_MAKE_MAGICSTAMP(0),
264 NAMESERVERREMOTENOTIFY_MAKE_MAGICSTAMP(1)) == true))) { 264 NAMESERVERREMOTENOTIFY_MAKE_MAGICSTAMP(1)) == true))) {
265 printk(KERN_ERR "nameserver_remotenotify_params_init failed: " 265 pr_err("nameserver_remotenotify_params_init failed: "
266 "Module is not initialized!\n"); 266 "Module is not initialized!\n");
267 return; 267 return;
268 } 268 }
269 269
270 if (WARN_ON(unlikely(params == NULL))) { 270 if (WARN_ON(unlikely(params == NULL))) {
271 printk(KERN_ERR "nameserver_remotenotify_params_init failed: " 271 pr_err("nameserver_remotenotify_params_init failed: "
272 "Argument of type(nameserver_remotenotify_params *) " 272 "Argument of type(nameserver_remotenotify_params *) "
273 "is NULL!\n"); 273 "is NULL!\n");
274 return; 274 return;
@@ -377,7 +377,7 @@ signal_response:
377 377
378exit: 378exit:
379 if (retval < 0) { 379 if (retval < 0) {
380 printk(KERN_ERR "nameserver_remotenotify_callback failed! " 380 pr_err("nameserver_remotenotify_callback failed! "
381 "status = 0x%x\n", retval); 381 "status = 0x%x\n", retval);
382 } 382 }
383 return; 383 return;
@@ -520,7 +520,7 @@ down_error:
520 mutex_unlock(obj->local_gate); 520 mutex_unlock(obj->local_gate);
521exit: 521exit:
522 if (retval < 0) 522 if (retval < 0)
523 printk(KERN_ERR "nameserver_remotenotify_get failed! " 523 pr_err("nameserver_remotenotify_get failed! "
524 "status = 0x%x", retval); 524 "status = 0x%x", retval);
525 return retval; 525 return retval;
526} 526}
@@ -646,7 +646,7 @@ mem_error:
646 kfree(handle); 646 kfree(handle);
647 647
648exit: 648exit:
649 printk(KERN_ERR "nameserver_remotenotify_create failed! " 649 pr_err("nameserver_remotenotify_create failed! "
650 "status = 0x%x\n", retval); 650 "status = 0x%x\n", retval);
651 return NULL; 651 return NULL;
652} 652}
@@ -708,7 +708,7 @@ free_handle:
708 708
709exit: 709exit:
710 if (retval < 0) { 710 if (retval < 0) {
711 printk(KERN_ERR "nameserver_remotenotify_delete failed! " 711 pr_err("nameserver_remotenotify_delete failed! "
712 "status = 0x%x\n", retval); 712 "status = 0x%x\n", retval);
713 } 713 }
714 return retval; 714 return retval;
@@ -776,7 +776,7 @@ int nameserver_remotenotify_attach(u16 remote_proc_id, void *shared_addr)
776 return 0; 776 return 0;
777 777
778exit: 778exit:
779 printk(KERN_ERR "nameserver_remotenotify_attach failed! status = 0x%x", 779 pr_err("nameserver_remotenotify_attach failed! status = 0x%x",
780 retval); 780 retval);
781 return retval; 781 return retval;
782} 782}
@@ -818,7 +818,7 @@ int nameserver_remotenotify_detach(u16 remote_proc_id)
818 return 0; 818 return 0;
819 819
820exit: 820exit:
821 printk(KERN_ERR "nameserver_remotenotify_detach failed! status = 0x%x", 821 pr_err("nameserver_remotenotify_detach failed! status = 0x%x",
822 retval); 822 retval);
823 return retval; 823 return retval;
824} 824}
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)
640 640
641exit: 641exit:
642 if (status < 0) 642 if (status < 0)
643 printk(KERN_ERR "platform_get_config failed! status = 0x%x\n", 643 pr_err("platform_get_config failed! status = 0x%x\n", status);
644 status);
645 return; 644 return;
646} 645}
647 646
@@ -704,7 +703,7 @@ platform_override_config(struct platform_config *config)
704 703
705exit: 704exit:
706 if (status < 0) 705 if (status < 0)
707 printk(KERN_ERR "platform_override_config failed! status " 706 pr_err("platform_override_config failed! status "
708 "= 0x%x\n", status); 707 "= 0x%x\n", status);
709 return status; 708 return status;
710} 709}
@@ -728,10 +727,10 @@ platform_setup(void)
728 /* Initialize PlatformMem */ 727 /* Initialize PlatformMem */
729 status = platform_mem_setup(); 728 status = platform_mem_setup();
730 if (status < 0) { 729 if (status < 0) {
731 printk(KERN_ERR "platform_setup : platform_mem_setup " 730 pr_err("platform_setup : platform_mem_setup "
732 "failed [0x%x]\n", status); 731 "failed [0x%x]\n", status);
733 } else { 732 } else {
734 printk(KERN_ERR "platform_mem_setup : status [0x%x]\n" , 733 pr_err("platform_mem_setup : status [0x%x]\n" ,
735 status); 734 status);
736 platform_module->platform_mem_init_flag = true; 735 platform_module->platform_mem_init_flag = true;
737 } 736 }
@@ -740,10 +739,10 @@ platform_setup(void)
740 739
741 status = multiproc_setup(&(config->multiproc_config)); 740 status = multiproc_setup(&(config->multiproc_config));
742 if (status < 0) { 741 if (status < 0) {
743 printk(KERN_ERR "platform_setup : multiproc_setup " 742 pr_err("platform_setup : multiproc_setup "
744 "failed [0x%x]\n", status); 743 "failed [0x%x]\n", status);
745 } else { 744 } else {
746 printk(KERN_ERR "platform_setup : status [0x%x]\n", status); 745 pr_err("platform_setup : status [0x%x]\n", status);
747 platform_module->multiproc_init_flag = true; 746 platform_module->multiproc_init_flag = true;
748 } 747 }
749 748
@@ -751,11 +750,10 @@ platform_setup(void)
751 if (status >= 0) { 750 if (status >= 0) {
752 status = proc_mgr_setup(&(config->proc_mgr_config)); 751 status = proc_mgr_setup(&(config->proc_mgr_config));
753 if (status < 0) { 752 if (status < 0) {
754 printk(KERN_ERR "platform_setup : proc_mgr_setup " 753 pr_err("platform_setup : proc_mgr_setup "
755 "failed [0x%x]\n", status); 754 "failed [0x%x]\n", status);
756 } else { 755 } else {
757 printk(KERN_ERR "proc_mgr_setup : status [0x%x]\n", 756 pr_err("proc_mgr_setup : status [0x%x]\n", status);
758 status);
759 platform_module->proc_mgr_init_flag = true; 757 platform_module->proc_mgr_init_flag = true;
760 } 758 }
761 } 759 }
@@ -764,11 +762,10 @@ platform_setup(void)
764 if (status >= 0) { 762 if (status >= 0) {
765 status = sharedregion_setup(&config->sharedregion_config); 763 status = sharedregion_setup(&config->sharedregion_config);
766 if (status < 0) { 764 if (status < 0) {
767 printk(KERN_ERR "platform_setup : sharedregion_setup " 765 pr_err("platform_setup : sharedregion_setup "
768 "failed [0x%x]\n", status); 766 "failed [0x%x]\n", status);
769 } else { 767 } else {
770 printk(KERN_ERR "sharedregion_setup : status [0x%x]\n", 768 pr_err("sharedregion_setup : status [0x%x]\n", status);
771 status);
772 platform_module->sharedregion_init_flag = true; 769 platform_module->sharedregion_init_flag = true;
773 } 770 }
774 } 771 }
@@ -778,11 +775,11 @@ platform_setup(void)
778 status = notify_ducatidrv_setup(&config-> 775 status = notify_ducatidrv_setup(&config->
779 notify_ducatidrv_config); 776 notify_ducatidrv_config);
780 if (status < 0) { 777 if (status < 0) {
781 printk(KERN_ERR "platform_setup : " 778 pr_err("platform_setup : "
782 "notify_ducatidrv_setup failed [0x%x]\n", 779 "notify_ducatidrv_setup failed [0x%x]\n",
783 status); 780 status);
784 } else { 781 } else {
785 printk(KERN_ERR "notify_ducatidrv_setup : " 782 pr_err("notify_ducatidrv_setup : "
786 "status [0x%x]\n", status); 783 "status [0x%x]\n", status);
787 platform_module->notify_ducatidrv_init_flag = true; 784 platform_module->notify_ducatidrv_init_flag = true;
788 } 785 }
@@ -792,11 +789,10 @@ platform_setup(void)
792 if (status >= 0) { 789 if (status >= 0) {
793 status = notify_setup(&config->notify_config); 790 status = notify_setup(&config->notify_config);
794 if (status < 0) { 791 if (status < 0) {
795 printk(KERN_ERR "platform_setup : notify_setup " 792 pr_err("platform_setup : notify_setup "
796 "failed [0x%x]\n", status); 793 "failed [0x%x]\n", status);
797 } else { 794 } else {
798 printk(KERN_ERR "notify_setup : status [0x%x]\n", 795 pr_err("notify_setup : status [0x%x]\n", status);
799 status);
800 platform_module->notify_init_flag = true; 796 platform_module->notify_init_flag = true;
801 } 797 }
802 } 798 }
@@ -805,11 +801,10 @@ platform_setup(void)
805 if (status >= 0) { 801 if (status >= 0) {
806 status = ipu_pm_setup(&config->ipu_pm_config); 802 status = ipu_pm_setup(&config->ipu_pm_config);
807 if (status < 0) { 803 if (status < 0) {
808 printk(KERN_ERR "platform_setup : ipu_pm_setup " 804 pr_err("platform_setup : ipu_pm_setup "
809 "failed [0x%x]\n", status); 805 "failed [0x%x]\n", status);
810 } else { 806 } else {
811 printk(KERN_ERR "ipu_pm_setup : status [0x%x]\n", 807 pr_err("ipu_pm_setup : status [0x%x]\n", status);
812 status);
813 platform_module->ipu_pm_init_flag = true; 808 platform_module->ipu_pm_init_flag = true;
814 } 809 }
815 } 810 }
@@ -817,11 +812,10 @@ platform_setup(void)
817 if (status >= 0) { 812 if (status >= 0) {
818 status = nameserver_setup(); 813 status = nameserver_setup();
819 if (status < 0) { 814 if (status < 0) {
820 printk(KERN_ERR "platform_setup : nameserver_setup " 815 pr_err("platform_setup : nameserver_setup "
821 "failed [0x%x]\n", status); 816 "failed [0x%x]\n", status);
822 } else { 817 } else {
823 printk(KERN_ERR "nameserver_setup : status [0x%x]\n", 818 pr_err("nameserver_setup : status [0x%x]\n", status);
824 status);
825 platform_module->nameserver_init_flag = true; 819 platform_module->nameserver_init_flag = true;
826 } 820 }
827 } 821 }
@@ -830,11 +824,10 @@ platform_setup(void)
830 if (status >= 0) { 824 if (status >= 0) {
831 status = gatemp_setup(&config->gatemp_config); 825 status = gatemp_setup(&config->gatemp_config);
832 if (status < 0) { 826 if (status < 0) {
833 printk(KERN_ERR "platform_setup : gatemp_setup " 827 pr_err("platform_setup : gatemp_setup "
834 "failed [0x%x]\n", status); 828 "failed [0x%x]\n", status);
835 } else { 829 } else {
836 printk(KERN_ERR "gatemp_setup : status [0x%x]\n", 830 pr_err("gatemp_setup : status [0x%x]\n", status);
837 status);
838 platform_module->gatemp_init_flag = true; 831 platform_module->gatemp_init_flag = true;
839 } 832 }
840 } 833 }
@@ -843,11 +836,10 @@ platform_setup(void)
843 if (status >= 0) { 836 if (status >= 0) {
844 status = gatepeterson_setup(&config->gatepeterson_config); 837 status = gatepeterson_setup(&config->gatepeterson_config);
845 if (status < 0) { 838 if (status < 0) {
846 printk(KERN_ERR "platform_setup : gatepeterson_setup " 839 pr_err("platform_setup : gatepeterson_setup "
847 "failed [0x%x]\n", status); 840 "failed [0x%x]\n", status);
848 } else { 841 } else {
849 printk(KERN_ERR "gatepeterson_setup : status [0x%x]\n", 842 pr_err("gatepeterson_setup : status [0x%x]\n", status);
850 status);
851 platform_module->gatepeterson_init_flag = true; 843 platform_module->gatepeterson_init_flag = true;
852 } 844 }
853 } 845 }
@@ -859,7 +851,7 @@ platform_setup(void)
859 m_info.is_cached = false; 851 m_info.is_cached = false;
860 status = platform_mem_map(&m_info); 852 status = platform_mem_map(&m_info);
861 if (status < 0) { 853 if (status < 0) {
862 printk(KERN_ERR "platform_setup : platform_mem_map " 854 pr_err("platform_setup : platform_mem_map "
863 "failed [0x%x]\n", status); 855 "failed [0x%x]\n", status);
864 } else { 856 } else {
865 config->gatehwspinlock_config.num_locks = 32; 857 config->gatehwspinlock_config.num_locks = 32;
@@ -868,7 +860,7 @@ platform_setup(void)
868 status = gatehwspinlock_setup(&config-> 860 status = gatehwspinlock_setup(&config->
869 gatehwspinlock_config); 861 gatehwspinlock_config);
870 if (status < 0) { 862 if (status < 0) {
871 printk(KERN_ERR "platform_setup : " 863 pr_err("platform_setup : "
872 "gatehwspinlock_setup failed [0x%x]\n", 864 "gatehwspinlock_setup failed [0x%x]\n",
873 status); 865 status);
874 } else 866 } else
@@ -881,11 +873,10 @@ platform_setup(void)
881 if (status >= 0) { 873 if (status >= 0) {
882 status = messageq_setup(&config->messageq_config); 874 status = messageq_setup(&config->messageq_config);
883 if (status < 0) { 875 if (status < 0) {
884 printk(KERN_ERR "platform_setup : messageq_setup " 876 pr_err("platform_setup : messageq_setup "
885 "failed [0x%x]\n", status); 877 "failed [0x%x]\n", status);
886 } else { 878 } else {
887 printk(KERN_ERR "messageq_setup : status [0x%x]\n", 879 pr_err("messageq_setup : status [0x%x]\n", status);
888 status);
889 platform_module->messageq_init_flag = true; 880 platform_module->messageq_init_flag = true;
890 } 881 }
891 } 882 }
@@ -894,10 +885,10 @@ platform_setup(void)
894 if (status >= 0) { 885 if (status >= 0) {
895 status = ringio_setup(&config->ringio_config); 886 status = ringio_setup(&config->ringio_config);
896 if (status < 0) { 887 if (status < 0) {
897 printk(KERN_ERR "platform_setup : ringio_setup " 888 pr_err("platform_setup : ringio_setup "
898 "failed [0x%x]\n", status); 889 "failed [0x%x]\n", status);
899 } else { 890 } else {
900 printk(KERN_ERR "ringio_setup : status [0x%x]\n", 891 pr_err("ringio_setup : status [0x%x]\n",
901 status); 892 status);
902 platform_module->ringio_init_flag = true; 893 platform_module->ringio_init_flag = true;
903 } 894 }
@@ -908,11 +899,11 @@ platform_setup(void)
908 status = ringiotransportshm_setup(&config-> 899 status = ringiotransportshm_setup(&config->
909 ringiotransportshm_config); 900 ringiotransportshm_config);
910 if (status < 0) { 901 if (status < 0) {
911 printk(KERN_ERR "platform_setup : " 902 pr_err("platform_setup : "
912 "ringiotransportshm_setup " 903 "ringiotransportshm_setup "
913 "failed [0x%x]\n", status); 904 "failed [0x%x]\n", status);
914 } else { 905 } else {
915 printk(KERN_ERR "ringiotransportshm_setup : status " 906 pr_err("ringiotransportshm_setup : status "
916 "[0x%x]\n", status); 907 "[0x%x]\n", status);
917 platform_module->ringiotransportshm_init_flag = true; 908 platform_module->ringiotransportshm_init_flag = true;
918 } 909 }
@@ -922,11 +913,10 @@ platform_setup(void)
922 if (status >= 0) { 913 if (status >= 0) {
923 status = heapbufmp_setup(&config->heapbufmp_config); 914 status = heapbufmp_setup(&config->heapbufmp_config);
924 if (status < 0) { 915 if (status < 0) {
925 printk(KERN_ERR "platform_setup : heapbufmp_setup " 916 pr_err("platform_setup : heapbufmp_setup "
926 "failed [0x%x]\n", status); 917 "failed [0x%x]\n", status);
927 } else { 918 } else {
928 printk(KERN_ERR "heapbufmp_setup : status [0x%x]\n", 919 pr_err("heapbufmp_setup : status [0x%x]\n", status);
929 status);
930 platform_module->heapbufmp_init_flag = true; 920 platform_module->heapbufmp_init_flag = true;
931 } 921 }
932 } 922 }
@@ -935,11 +925,10 @@ platform_setup(void)
935 if (status >= 0) { 925 if (status >= 0) {
936 status = heapmemmp_setup(&config->heapmemmp_config); 926 status = heapmemmp_setup(&config->heapmemmp_config);
937 if (status < 0) { 927 if (status < 0) {
938 printk(KERN_ERR "platform_setup : heapmemmp_setup " 928 pr_err("platform_setup : heapmemmp_setup "
939 "failed [0x%x]\n", status); 929 "failed [0x%x]\n", status);
940 } else { 930 } else {
941 printk(KERN_ERR "heapmemmp_setup : status [0x%x]\n", 931 pr_err("heapmemmp_setup : status [0x%x]\n", status);
942 status);
943 platform_module->heapmemmp_init_flag = true; 932 platform_module->heapmemmp_init_flag = true;
944 } 933 }
945 } 934 }
@@ -948,10 +937,10 @@ platform_setup(void)
948 if (status >= 0) { 937 if (status >= 0) {
949 status = heapmultibuf_setup(&config->heapmultibuf_config); 938 status = heapmultibuf_setup(&config->heapmultibuf_config);
950 if (status < 0) { 939 if (status < 0) {
951 printk(KERN_ERR "platform_setup : heapmultibuf_setup " 940 pr_err("platform_setup : heapmultibuf_setup "
952 "failed [0x%x]\n", status); 941 "failed [0x%x]\n", status);
953 } else { 942 } else {
954 printk(KERN_ERR "heapmultibuf_setup : status [0x%x]\n", 943 pr_err("heapmultibuf_setup : status [0x%x]\n",
955 status); 944 status);
956 platform_module->heapmultibuf_init_flag = true; 945 platform_module->heapmultibuf_init_flag = true;
957 } 946 }
@@ -962,11 +951,11 @@ platform_setup(void)
962 status = listmp_setup( 951 status = listmp_setup(
963 &config->listmp_config); 952 &config->listmp_config);
964 if (status < 0) { 953 if (status < 0) {
965 printk(KERN_ERR "platform_setup : " 954 pr_err("platform_setup : "
966 "listmp_setup failed [0x%x]\n", 955 "listmp_setup failed [0x%x]\n",
967 status); 956 status);
968 } else { 957 } else {
969 printk(KERN_ERR "listmp_setup : " 958 pr_err("listmp_setup : "
970 "status [0x%x]\n", status); 959 "status [0x%x]\n", status);
971 platform_module->listmp_init_flag = true; 960 platform_module->listmp_init_flag = true;
972 } 961 }
@@ -977,12 +966,11 @@ platform_setup(void)
977 status = transportshm_setup( 966 status = transportshm_setup(
978 &config->transportshm_config); 967 &config->transportshm_config);
979 if (status < 0) { 968 if (status < 0) {
980 printk(KERN_ERR "platform_setup : " 969 pr_err("platform_setup : "
981 "transportshm_setup failed [0x%x]\n", 970 "transportshm_setup failed [0x%x]\n",
982 status); 971 status);
983 } else { 972 } else {
984 printk(KERN_ERR "transportshm_setup : " 973 pr_err("transportshm_setup : status [0x%x]\n", status);
985 "status [0x%x]\n", status);
986 platform_module->transportshm_init_flag = true; 974 platform_module->transportshm_init_flag = true;
987 } 975 }
988 } 976 }
@@ -992,11 +980,11 @@ platform_setup(void)
992 status = nameserver_remotenotify_setup( 980 status = nameserver_remotenotify_setup(
993 &config->nameserver_remotenotify_config); 981 &config->nameserver_remotenotify_config);
994 if (status < 0) { 982 if (status < 0) {
995 printk(KERN_ERR "platform_setup : " 983 pr_err("platform_setup : "
996 "nameserver_remotenotify_setup failed " 984 "nameserver_remotenotify_setup failed "
997 "[0x%x]\n", status); 985 "[0x%x]\n", status);
998 } else { 986 } else {
999 printk(KERN_ERR "nameserver_remotenotify_setup : " 987 pr_err("nameserver_remotenotify_setup : "
1000 "status [0x%x]\n", status); 988 "status [0x%x]\n", status);
1001 platform_module->nameserver_remotenotify_init_flag = 989 platform_module->nameserver_remotenotify_init_flag =
1002 true; 990 true;
@@ -1053,11 +1041,10 @@ platform_setup(void)
1053 if (status >= 0) { 1041 if (status >= 0) {
1054 status = _platform_setup(); 1042 status = _platform_setup();
1055 if (status < 0) { 1043 if (status < 0) {
1056 printk(KERN_ERR "platform_setup : _platform_setup " 1044 pr_err("platform_setup : _platform_setup "
1057 "failed [0x%x]\n", status); 1045 "failed [0x%x]\n", status);
1058 } else { 1046 } else {
1059 printk(KERN_ERR "_platform_setup : status [0x%x]\n", 1047 pr_err("_platform_setup : status [0x%x]\n", status);
1060 status);
1061 platform_module->platform_init_flag = true; 1048 platform_module->platform_init_flag = true;
1062 } 1049 }
1063 1050
@@ -1081,7 +1068,7 @@ platform_destroy(void)
1081 if (platform_module->platform_init_flag == true) { 1068 if (platform_module->platform_init_flag == true) {
1082 status = _platform_destroy(); 1069 status = _platform_destroy();
1083 if (status < 0) { 1070 if (status < 0) {
1084 printk(KERN_ERR "platform_destroy : _platform_destroy " 1071 pr_err("platform_destroy : _platform_destroy "
1085 "failed [0x%x]\n", status); 1072 "failed [0x%x]\n", status);
1086 } else { 1073 } else {
1087 platform_module->platform_init_flag = false; 1074 platform_module->platform_init_flag = false;
@@ -1131,7 +1118,7 @@ platform_destroy(void)
1131 if (platform_module->nameserver_remotenotify_init_flag == true) { 1118 if (platform_module->nameserver_remotenotify_init_flag == true) {
1132 status = nameserver_remotenotify_destroy(); 1119 status = nameserver_remotenotify_destroy();
1133 if (status < 0) { 1120 if (status < 0) {
1134 printk(KERN_ERR "platform_destroy : " 1121 pr_err("platform_destroy : "
1135 "nameserver_remotenotify_destroy " 1122 "nameserver_remotenotify_destroy "
1136 "failed [0x%x]\n", status); 1123 "failed [0x%x]\n", status);
1137 } else { 1124 } else {
@@ -1144,7 +1131,7 @@ platform_destroy(void)
1144 if (platform_module->transportshm_init_flag == true) { 1131 if (platform_module->transportshm_init_flag == true) {
1145 status = transportshm_destroy(); 1132 status = transportshm_destroy();
1146 if (status < 0) { 1133 if (status < 0) {
1147 printk(KERN_ERR "platform_destroy : " 1134 pr_err("platform_destroy : "
1148 "transportshm_destroy failed " 1135 "transportshm_destroy failed "
1149 "[0x%x]\n", status); 1136 "[0x%x]\n", status);
1150 } else { 1137 } else {
@@ -1157,7 +1144,7 @@ platform_destroy(void)
1157 if (platform_module->listmp_init_flag == true) { 1144 if (platform_module->listmp_init_flag == true) {
1158 status = listmp_destroy(); 1145 status = listmp_destroy();
1159 if (status < 0) { 1146 if (status < 0) {
1160 printk(KERN_ERR "platform_destroy : " 1147 pr_err("platform_destroy : "
1161 "listmp_destroy failed [0x%x]\n", 1148 "listmp_destroy failed [0x%x]\n",
1162 status); 1149 status);
1163 } else { 1150 } else {
@@ -1170,7 +1157,7 @@ platform_destroy(void)
1170 if (platform_module->heapmultibuf_init_flag == true) { 1157 if (platform_module->heapmultibuf_init_flag == true) {
1171 status = heapmultibuf_destroy(); 1158 status = heapmultibuf_destroy();
1172 if (status < 0) { 1159 if (status < 0) {
1173 printk(KERN_ERR "platform_destroy : " 1160 pr_err("platform_destroy : "
1174 "heapmultibuf_destroy " 1161 "heapmultibuf_destroy "
1175 "failed [0x%x]\n", status); 1162 "failed [0x%x]\n", status);
1176 } else { 1163 } else {
@@ -1182,7 +1169,7 @@ platform_destroy(void)
1182 if (platform_module->heapbufmp_init_flag == true) { 1169 if (platform_module->heapbufmp_init_flag == true) {
1183 status = heapbufmp_destroy(); 1170 status = heapbufmp_destroy();
1184 if (status < 0) { 1171 if (status < 0) {
1185 printk(KERN_ERR "platform_destroy : heapbufmp_destroy " 1172 pr_err("platform_destroy : heapbufmp_destroy "
1186 "failed [0x%x]\n", status); 1173 "failed [0x%x]\n", status);
1187 } else { 1174 } else {
1188 platform_module->heapbufmp_init_flag = false; 1175 platform_module->heapbufmp_init_flag = false;
@@ -1193,7 +1180,7 @@ platform_destroy(void)
1193 if (platform_module->heapmemmp_init_flag == true) { 1180 if (platform_module->heapmemmp_init_flag == true) {
1194 status = heapmemmp_destroy(); 1181 status = heapmemmp_destroy();
1195 if (status < 0) { 1182 if (status < 0) {
1196 printk(KERN_ERR "platform_destroy : heapmemmp_destroy " 1183 pr_err("platform_destroy : heapmemmp_destroy "
1197 "failed [0x%x]\n", status); 1184 "failed [0x%x]\n", status);
1198 } else { 1185 } else {
1199 platform_module->heapmemmp_init_flag = false; 1186 platform_module->heapmemmp_init_flag = false;
@@ -1204,7 +1191,7 @@ platform_destroy(void)
1204 if (platform_module->messageq_init_flag == true) { 1191 if (platform_module->messageq_init_flag == true) {
1205 status = messageq_destroy(); 1192 status = messageq_destroy();
1206 if (status < 0) { 1193 if (status < 0) {
1207 printk(KERN_ERR "platform_destroy : messageq_destroy " 1194 pr_err("platform_destroy : messageq_destroy "
1208 "failed [0x%x]\n", status); 1195 "failed [0x%x]\n", status);
1209 } else { 1196 } else {
1210 platform_module->messageq_init_flag = false; 1197 platform_module->messageq_init_flag = false;
@@ -1215,7 +1202,7 @@ platform_destroy(void)
1215 if (platform_module->ringio_init_flag == true) { 1202 if (platform_module->ringio_init_flag == true) {
1216 status = ringio_destroy(); 1203 status = ringio_destroy();
1217 if (status < 0) { 1204 if (status < 0) {
1218 printk(KERN_ERR "platform_destroy : ringio_destroy " 1205 pr_err("platform_destroy : ringio_destroy "
1219 "failed [0x%x]\n", status); 1206 "failed [0x%x]\n", status);
1220 } else { 1207 } else {
1221 platform_module->ringio_init_flag = false; 1208 platform_module->ringio_init_flag = false;
@@ -1227,7 +1214,7 @@ platform_destroy(void)
1227 if (platform_module->ringiotransportshm_init_flag == true) { 1214 if (platform_module->ringiotransportshm_init_flag == true) {
1228 status = ringiotransportshm_destroy(); 1215 status = ringiotransportshm_destroy();
1229 if (status < 0) { 1216 if (status < 0) {
1230 printk(KERN_ERR "platform_destroy : " 1217 pr_err("platform_destroy : "
1231 "ringiotransportshm_destroy " 1218 "ringiotransportshm_destroy "
1232 "failed [0x%x]\n", status); 1219 "failed [0x%x]\n", status);
1233 } else { 1220 } else {
@@ -1239,7 +1226,7 @@ platform_destroy(void)
1239 if (platform_module->gatepeterson_init_flag == true) { 1226 if (platform_module->gatepeterson_init_flag == true) {
1240 status = gatepeterson_destroy(); 1227 status = gatepeterson_destroy();
1241 if (status < 0) { 1228 if (status < 0) {
1242 printk(KERN_ERR "platform_destroy : " 1229 pr_err("platform_destroy : "
1243 "gatepeterson_destroy failed [0x%x]\n", status); 1230 "gatepeterson_destroy failed [0x%x]\n", status);
1244 } else { 1231 } else {
1245 platform_module->gatepeterson_init_flag = false; 1232 platform_module->gatepeterson_init_flag = false;
@@ -1250,7 +1237,7 @@ platform_destroy(void)
1250 if (platform_module->gatehwspinlock_init_flag == true) { 1237 if (platform_module->gatehwspinlock_init_flag == true) {
1251 status = gatehwspinlock_destroy(); 1238 status = gatehwspinlock_destroy();
1252 if (status < 0) { 1239 if (status < 0) {
1253 printk(KERN_ERR "platform_destroy : " 1240 pr_err("platform_destroy : "
1254 "gatehwspinlock_destroy failed " 1241 "gatehwspinlock_destroy failed "
1255 "[0x%x]\n", status); 1242 "[0x%x]\n", status);
1256 } else { 1243 } else {
@@ -1262,7 +1249,7 @@ platform_destroy(void)
1262 u_info.is_cached = false; 1249 u_info.is_cached = false;
1263 status = platform_mem_unmap(&u_info); 1250 status = platform_mem_unmap(&u_info);
1264 if (status < 0) 1251 if (status < 0)
1265 printk(KERN_ERR "platform_destroy : platform_mem_unmap" 1252 pr_err("platform_destroy : platform_mem_unmap"
1266 " failed [0x%x]\n", status); 1253 " failed [0x%x]\n", status);
1267 } 1254 }
1268 1255
@@ -1270,7 +1257,7 @@ platform_destroy(void)
1270 if (platform_module->gatemp_init_flag == true) { 1257 if (platform_module->gatemp_init_flag == true) {
1271 status = gatemp_destroy(); 1258 status = gatemp_destroy();
1272 if (status < 0) { 1259 if (status < 0) {
1273 printk(KERN_ERR "platform_destroy : " 1260 pr_err("platform_destroy : "
1274 "gatemp_destroy failed [0x%x]\n", status); 1261 "gatemp_destroy failed [0x%x]\n", status);
1275 } else { 1262 } else {
1276 platform_module->gatemp_init_flag = false; 1263 platform_module->gatemp_init_flag = false;
@@ -1281,7 +1268,7 @@ platform_destroy(void)
1281 if (platform_module->nameserver_init_flag == true) { 1268 if (platform_module->nameserver_init_flag == true) {
1282 status = nameserver_destroy(); 1269 status = nameserver_destroy();
1283 if (status < 0) { 1270 if (status < 0) {
1284 printk(KERN_ERR "platform_destroy : nameserver_destroy " 1271 pr_err("platform_destroy : nameserver_destroy "
1285 "failed [0x%x]\n", status); 1272 "failed [0x%x]\n", status);
1286 } else { 1273 } else {
1287 platform_module->nameserver_init_flag = false; 1274 platform_module->nameserver_init_flag = false;
@@ -1291,7 +1278,7 @@ platform_destroy(void)
1291 if (platform_module->ipu_pm_init_flag == true) { 1278 if (platform_module->ipu_pm_init_flag == true) {
1292 status = ipu_pm_destroy(); 1279 status = ipu_pm_destroy();
1293 if (status < 0) { 1280 if (status < 0) {
1294 printk(KERN_ERR "platform_destroy : ipu_pm_destroy " 1281 pr_err("platform_destroy : ipu_pm_destroy "
1295 "failed [0x%x]\n", status); 1282 "failed [0x%x]\n", status);
1296 } else { 1283 } else {
1297 platform_module->ipu_pm_init_flag = false; 1284 platform_module->ipu_pm_init_flag = false;
@@ -1302,7 +1289,7 @@ platform_destroy(void)
1302 if (platform_module->notify_ducatidrv_init_flag == true) { 1289 if (platform_module->notify_ducatidrv_init_flag == true) {
1303 status = notify_ducatidrv_destroy(); 1290 status = notify_ducatidrv_destroy();
1304 if (status < 0) { 1291 if (status < 0) {
1305 printk(KERN_ERR "platform_destroy : " 1292 pr_err("platform_destroy : "
1306 "notify_ducatidrv_destroy failed [0x%x]\n", 1293 "notify_ducatidrv_destroy failed [0x%x]\n",
1307 status); 1294 status);
1308 } else { 1295 } else {
@@ -1314,7 +1301,7 @@ platform_destroy(void)
1314 if (platform_module->notify_init_flag == true) { 1301 if (platform_module->notify_init_flag == true) {
1315 status = notify_destroy(); 1302 status = notify_destroy();
1316 if (status < 0) { 1303 if (status < 0) {
1317 printk(KERN_ERR "platform_destroy : notify_destroy " 1304 pr_err("platform_destroy : notify_destroy "
1318 "failed [0x%x]\n", status); 1305 "failed [0x%x]\n", status);
1319 } else { 1306 } else {
1320 platform_module->notify_init_flag = false; 1307 platform_module->notify_init_flag = false;
@@ -1325,7 +1312,7 @@ platform_destroy(void)
1325 if (platform_module->sharedregion_init_flag == true) { 1312 if (platform_module->sharedregion_init_flag == true) {
1326 status = sharedregion_destroy(); 1313 status = sharedregion_destroy();
1327 if (status < 0) { 1314 if (status < 0) {
1328 printk(KERN_ERR "platform_destroy : " 1315 pr_err("platform_destroy : "
1329 "sharedregion_destroy failed [0x%x]\n", status); 1316 "sharedregion_destroy failed [0x%x]\n", status);
1330 } else { 1317 } else {
1331 platform_module->sharedregion_init_flag = false; 1318 platform_module->sharedregion_init_flag = false;
@@ -1336,7 +1323,7 @@ platform_destroy(void)
1336 if (platform_module->proc_mgr_init_flag == true) { 1323 if (platform_module->proc_mgr_init_flag == true) {
1337 status = proc_mgr_destroy(); 1324 status = proc_mgr_destroy();
1338 if (status < 0) { 1325 if (status < 0) {
1339 printk(KERN_ERR "platform_destroy : proc_mgr_destroy " 1326 pr_err("platform_destroy : proc_mgr_destroy "
1340 "failed [0x%x]\n", status); 1327 "failed [0x%x]\n", status);
1341 } else { 1328 } else {
1342 platform_module->proc_mgr_init_flag = false; 1329 platform_module->proc_mgr_init_flag = false;
@@ -1347,7 +1334,7 @@ platform_destroy(void)
1347 if (platform_module->multiproc_init_flag == true) { 1334 if (platform_module->multiproc_init_flag == true) {
1348 status = multiproc_destroy(); 1335 status = multiproc_destroy();
1349 if (status < 0) { 1336 if (status < 0) {
1350 printk(KERN_ERR "platform_destroy : multiproc_destroy " 1337 pr_err("platform_destroy : multiproc_destroy "
1351 "failed [0x%x]\n", status); 1338 "failed [0x%x]\n", status);
1352 } else { 1339 } else {
1353 platform_module->multiproc_init_flag = false; 1340 platform_module->multiproc_init_flag = false;
@@ -1358,7 +1345,7 @@ platform_destroy(void)
1358 if (platform_module->platform_mem_init_flag == true) { 1345 if (platform_module->platform_mem_init_flag == true) {
1359 status = platform_mem_destroy(); 1346 status = platform_mem_destroy();
1360 if (status < 0) { 1347 if (status < 0) {
1361 printk(KERN_ERR "platform_destroy : " 1348 pr_err("platform_destroy : "
1362 "platform_mem_destroy failed [0x%x]\n", status); 1349 "platform_mem_destroy failed [0x%x]\n", status);
1363 } else { 1350 } else {
1364 platform_module->platform_mem_init_flag = false; 1351 platform_module->platform_mem_init_flag = false;
@@ -1400,7 +1387,7 @@ static s32 _platform_setup(void)
1400 /* Get MultiProc ID by name. */ 1387 /* Get MultiProc ID by name. */
1401 proc_id = multiproc_get_id("SysM3"); 1388 proc_id = multiproc_get_id("SysM3");
1402 if (proc_id >= MULTIPROC_MAXPROCESSORS) { 1389 if (proc_id >= MULTIPROC_MAXPROCESSORS) {
1403 printk(KERN_ERR "multi proc returned invalid proc id\n"); 1390 pr_err("multi proc returned invalid proc id\n");
1404 goto multiproc_id_fail; 1391 goto multiproc_id_fail;
1405 } 1392 }
1406 handle = &platform_objects[proc_id]; 1393 handle = &platform_objects[proc_id];
@@ -1438,7 +1425,7 @@ static s32 _platform_setup(void)
1438 /* Get MultiProc ID by name. */ 1425 /* Get MultiProc ID by name. */
1439 proc_id = multiproc_get_id("AppM3"); 1426 proc_id = multiproc_get_id("AppM3");
1440 if (proc_id >= MULTIPROC_MAXPROCESSORS) { 1427 if (proc_id >= MULTIPROC_MAXPROCESSORS) {
1441 printk(KERN_ERR "multi proc returned invalid proc id\n"); 1428 pr_err("multi proc returned invalid proc id\n");
1442 goto proc_mgr_create_fail; 1429 goto proc_mgr_create_fail;
1443 } 1430 }
1444 handle = &platform_objects[proc_id]; 1431 handle = &platform_objects[proc_id];
@@ -1470,7 +1457,7 @@ static s32 _platform_setup(void)
1470 /* Get MultiProc ID by name. */ 1457 /* Get MultiProc ID by name. */
1471 proc_id = multiproc_get_id("Tesla"); 1458 proc_id = multiproc_get_id("Tesla");
1472 if (proc_id >= MULTIPROC_MAXPROCESSORS) { 1459 if (proc_id >= MULTIPROC_MAXPROCESSORS) {
1473 printk(KERN_ERR "multi proc returned invalid proc id\n"); 1460 pr_err("multi proc returned invalid proc id\n");
1474 goto multiproc_id_fail; 1461 goto multiproc_id_fail;
1475 } 1462 }
1476 handle = &platform_objects[proc_id]; 1463 handle = &platform_objects[proc_id];
@@ -1717,7 +1704,7 @@ alloced_host_sr_config_exit:
1717 kfree(platform_host_sr_config); 1704 kfree(platform_host_sr_config);
1718exit: 1705exit:
1719 if (status < 0) 1706 if (status < 0)
1720 printk(KERN_ERR "platform_load_callback failed, status [0x%x]\n", 1707 pr_err("platform_load_callback failed, status [0x%x]\n",
1721 status); 1708 status);
1722 1709
1723 return status; 1710 return status;
@@ -1741,7 +1728,7 @@ int platform_start_callback(u16 proc_id, void *arg)
1741 } while (status < 0); 1728 } while (status < 0);
1742 1729
1743 if (status < 0) 1730 if (status < 0)
1744 printk(KERN_ERR "platform_load_callback failed, status [0x%x]\n", 1731 pr_err("platform_load_callback failed, status [0x%x]\n",
1745 status); 1732 status);
1746 1733
1747 return status; 1734 return status;
@@ -1849,12 +1836,12 @@ _platform_read_slave_memory(u16 proc_id,
1849 if (status >= 0) { 1836 if (status >= 0) {
1850 memcpy(value, (void *) m_addr, *num_bytes); 1837 memcpy(value, (void *) m_addr, *num_bytes);
1851 done = true; 1838 done = true;
1852 printk(KERN_ERR "_platform_read_slave_memory successful! " 1839 pr_err("_platform_read_slave_memory successful! "
1853 "status = 0x%x, proc_id = %d, addr = 0x%x, " 1840 "status = 0x%x, proc_id = %d, addr = 0x%x, "
1854 "m_addr = 0x%x, size = 0x%x", status, proc_id, addr, 1841 "m_addr = 0x%x, size = 0x%x", status, proc_id, addr,
1855 m_addr, *num_bytes); 1842 m_addr, *num_bytes);
1856 } else { 1843 } else {
1857 printk(KERN_ERR "_platform_read_slave_memory failed! " 1844 pr_err("_platform_read_slave_memory failed! "
1858 "status = 0x%x, proc_id = %d, addr = 0x%x, " 1845 "status = 0x%x, proc_id = %d, addr = 0x%x, "
1859 "m_addr = 0x%x, size = 0x%x", status, proc_id, addr, 1846 "m_addr = 0x%x, size = 0x%x", status, proc_id, addr,
1860 m_addr, *num_bytes); 1847 m_addr, *num_bytes);
@@ -1912,12 +1899,12 @@ static int _platform_write_slave_memory(u16 proc_id, u32 addr, void *value,
1912 if (status >= 0) { 1899 if (status >= 0) {
1913 memcpy((void *) m_addr, value, *num_bytes); 1900 memcpy((void *) m_addr, value, *num_bytes);
1914 done = true; 1901 done = true;
1915 printk(KERN_ERR "_platform_write_slave_memory successful! " 1902 pr_err("_platform_write_slave_memory successful! "
1916 "status = 0x%x, proc_id = %d, addr = 0x%x, " 1903 "status = 0x%x, proc_id = %d, addr = 0x%x, "
1917 "m_addr = 0x%x, size = 0x%x", status, proc_id, addr, 1904 "m_addr = 0x%x, size = 0x%x", status, proc_id, addr,
1918 m_addr, *num_bytes); 1905 m_addr, *num_bytes);
1919 } else { 1906 } else {
1920 printk(KERN_ERR "_platform_write_slave_memory failed! " 1907 pr_err("_platform_write_slave_memory failed! "
1921 "status = 0x%x, proc_id = %d, addr = 0x%x, " 1908 "status = 0x%x, proc_id = %d, addr = 0x%x, "
1922 "m_addr = 0x%x, size = 0x%x", status, proc_id, addr, 1909 "m_addr = 0x%x, size = 0x%x", status, proc_id, addr,
1923 m_addr, *num_bytes); 1910 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:
163 kfree(sharedregion_module->regions); 163 kfree(sharedregion_module->regions);
164 164
165error: 165error:
166 printk(KERN_ERR "sharedregion_setup failed status:%x\n", retval); 166 pr_err("sharedregion_setup failed status:%x\n", retval);
167 sharedregion_destroy(); 167 sharedregion_destroy();
168 return retval; 168 return retval;
169} 169}
@@ -203,7 +203,7 @@ int sharedregion_destroy(void)
203 203
204error: 204error:
205 if (retval < 0) { 205 if (retval < 0) {
206 printk(KERN_ERR "sharedregion_destroy failed status:%x\n", 206 pr_err("sharedregion_destroy failed status:%x\n",
207 retval); 207 retval);
208 } 208 }
209 return retval; 209 return retval;
@@ -271,10 +271,8 @@ int sharedregion_start(void)
271 } 271 }
272 272
273error: 273error:
274 if (retval < 0) { 274 if (retval < 0)
275 printk(KERN_ERR "sharedregion_start failed status:%x\n", 275 pr_err("sharedregion_start failed status:%x\n", retval);
276 retval);
277 }
278 return retval; 276 return retval;
279} 277}
280EXPORT_SYMBOL(sharedregion_start); 278EXPORT_SYMBOL(sharedregion_start);
@@ -325,7 +323,7 @@ int sharedregion_stop(void)
325 323
326error: 324error:
327 if (retval < 0) 325 if (retval < 0)
328 printk(KERN_ERR "sharedregion_stop failed status:%x\n", retval); 326 pr_err("sharedregion_stop failed status:%x\n", retval);
329 return retval; 327 return retval;
330} 328}
331EXPORT_SYMBOL(sharedregion_stop); 329EXPORT_SYMBOL(sharedregion_stop);
@@ -375,10 +373,8 @@ int sharedregion_attach(u16 remote_proc_id)
375 } 373 }
376 374
377error: 375error:
378 if (retval < 0) { 376 if (retval < 0)
379 printk(KERN_ERR "sharedregion_attach failed status:%x\n", 377 pr_err("sharedregion_attach failed status:%x\n", retval);
380 retval);
381 }
382 return retval; 378 return retval;
383} 379}
384EXPORT_SYMBOL(sharedregion_attach); 380EXPORT_SYMBOL(sharedregion_attach);
@@ -417,17 +413,15 @@ int sharedregion_detach(u16 remote_proc_id)
417 tmp_status = heapmemmp_close((void **) &(region->heap)); 413 tmp_status = heapmemmp_close((void **) &(region->heap));
418 if ((tmp_status < 0) && (retval >= 0)) { 414 if ((tmp_status < 0) && (retval >= 0)) {
419 retval = -1; 415 retval = -1;
420 printk(KERN_ERR "sharedregion_detach: " 416 pr_err("sharedregion_detach: "
421 "heapmemmp_close failed!"); 417 "heapmemmp_close failed!");
422 } 418 }
423 } 419 }
424 } 420 }
425 421
426error: 422error:
427 if (retval < 0) { 423 if (retval < 0)
428 printk(KERN_ERR "sharedregion_detach failed status:%x\n", 424 pr_err("sharedregion_detach failed status:%x\n", retval);
429 retval);
430 }
431 return retval; 425 return retval;
432} 426}
433EXPORT_SYMBOL(sharedregion_detach); 427EXPORT_SYMBOL(sharedregion_detach);
@@ -469,7 +463,7 @@ void *sharedregion_get_ptr(u32 *srptr)
469 return return_ptr; 463 return return_ptr;
470 464
471error: 465error:
472 printk(KERN_ERR "sharedregion_get_ptr failed 0x%x\n", retval); 466 pr_err("sharedregion_get_ptr failed 0x%x\n", retval);
473 return (void *)NULL; 467 return (void *)NULL;
474 468
475} 469}
@@ -522,7 +516,7 @@ u32 *sharedregion_get_srptr(void *addr, u16 id)
522 return ret_ptr; 516 return ret_ptr;
523 517
524error: 518error:
525 printk(KERN_ERR "sharedregion_get_srptr failed 0x%x\n", retval); 519 pr_err("sharedregion_get_srptr failed 0x%x\n", retval);
526 return (u32 *)NULL; 520 return (u32 *)NULL;
527} 521}
528EXPORT_SYMBOL(sharedregion_get_srptr); 522EXPORT_SYMBOL(sharedregion_get_srptr);
@@ -625,13 +619,13 @@ success:
625 619
626dup_entry_error: /* Fall through */ 620dup_entry_error: /* Fall through */
627mem_overlap_error: 621mem_overlap_error:
628 printk(KERN_WARNING "sharedregion_add entry exists status: %x\n", 622 pr_warn("sharedregion_add entry exists status: %x\n",
629 retval); 623 retval);
630 mutex_unlock(sharedregion_module->local_lock); 624 mutex_unlock(sharedregion_module->local_lock);
631 625
632error: 626error:
633 if (retval < 0) 627 if (retval < 0)
634 printk(KERN_ERR "sharedregion_add failed status:%x\n", retval); 628 pr_err("sharedregion_add failed status:%x\n", retval);
635 return retval; 629 return retval;
636} 630}
637EXPORT_SYMBOL(sharedregion_add); 631EXPORT_SYMBOL(sharedregion_add);
@@ -686,7 +680,7 @@ int sharedregion_remove(u32 index)
686 return 0; 680 return 0;
687 681
688error: 682error:
689 printk(KERN_ERR "sharedregion_remove failed status:%x\n", retval); 683 pr_err("sharedregion_remove failed status:%x\n", retval);
690 return retval; 684 return retval;
691} 685}
692EXPORT_SYMBOL(sharedregion_remove); 686EXPORT_SYMBOL(sharedregion_remove);
@@ -733,8 +727,7 @@ int sharedregion_get_table_info(u32 index, u16 proc_id,
733 return 0; 727 return 0;
734 728
735error: 729error:
736 printk(KERN_ERR "sharedregion_get_table_info failed status:%x\n", 730 pr_err("sharedregion_get_table_info failed status:%x\n", retval);
737 retval);
738 return retval; 731 return retval;
739} 732}
740EXPORT_SYMBOL(sharedregion_get_table_info); 733EXPORT_SYMBOL(sharedregion_get_table_info);
@@ -781,8 +774,7 @@ int sharedregion_set_table_info(u32 index, u16 proc_id,
781 return 0; 774 return 0;
782 775
783error: 776error:
784 printk(KERN_ERR "sharedregion_set_table_info failed status:%x\n", 777 pr_err("sharedregion_set_table_info failed status:%x\n", retval);
785 retval);
786 return retval; 778 return retval;
787} 779}
788EXPORT_SYMBOL(sharedregion_set_table_info); 780EXPORT_SYMBOL(sharedregion_set_table_info);
@@ -817,7 +809,7 @@ void sharedregion_get_region_info(u16 id, struct sharedregion_region *region)
817 809
818error: 810error:
819 if (retval < 0) { 811 if (retval < 0) {
820 printk(KERN_ERR "sharedregion_get_region_info failed: " 812 pr_err("sharedregion_get_region_info failed: "
821 "status = 0x%x", retval); 813 "status = 0x%x", retval);
822 } 814 }
823 return; 815 return;
@@ -868,20 +860,20 @@ int sharedregion_set_entry(u16 id, struct sharedregion_entry *entry)
868 retval = _sharedregion_check_overlap(region->entry.base, 860 retval = _sharedregion_check_overlap(region->entry.base,
869 region->entry.len); 861 region->entry.len);
870 if (retval < 0) { 862 if (retval < 0) {
871 printk(KERN_ERR "sharedregion_set_entry: Entry is overlapping " 863 pr_err("sharedregion_set_entry: Entry is overlapping "
872 "existing entry!"); 864 "existing entry!");
873 goto error; 865 goto error;
874 } 866 }
875 if (region->entry.is_valid) { 867 if (region->entry.is_valid) {
876 /*region entry should be invalid at this point */ 868 /*region entry should be invalid at this point */
877 retval = -EEXIST; 869 retval = -EEXIST;
878 printk(KERN_ERR "_sharedregion_setEntry: Entry already exists"); 870 pr_err("_sharedregion_setEntry: Entry already exists");
879 goto error; 871 goto error;
880 } 872 }
881 if ((entry->cache_enable) && (entry->cache_line_size == 0)) { 873 if ((entry->cache_enable) && (entry->cache_line_size == 0)) {
882 /* if cache enabled, cache line size must != 0 */ 874 /* if cache enabled, cache line size must != 0 */
883 retval = -1; 875 retval = -1;
884 printk(KERN_ERR "_sharedregion_setEntry: If cache enabled, " 876 pr_err("_sharedregion_setEntry: If cache enabled, "
885 "cache line size must != 0"); 877 "cache line size must != 0");
886 goto error; 878 goto error;
887 } 879 }
@@ -945,7 +937,7 @@ int sharedregion_set_entry(u16 id, struct sharedregion_entry *entry)
945 return 0; 937 return 0;
946 938
947error: 939error:
948 printk(KERN_ERR "sharedregion_set_entry failed! status = 0x%x", retval); 940 pr_err("sharedregion_set_entry failed! status = 0x%x", retval);
949 return retval; 941 return retval;
950} 942}
951 943
@@ -1021,8 +1013,7 @@ int sharedregion_clear_entry(u16 id)
1021 return 0; 1013 return 0;
1022 1014
1023error: 1015error:
1024 printk(KERN_ERR "sharedregion_clear_entry failed! status = 0x%x", 1016 pr_err("sharedregion_clear_entry failed! status = 0x%x", retval);
1025 retval);
1026 return retval; 1017 return retval;
1027} 1018}
1028 1019
@@ -1083,10 +1074,8 @@ void sharedregion_entry_init(struct sharedregion_entry *entry)
1083 entry->is_valid = false; 1074 entry->is_valid = false;
1084 1075
1085error: 1076error:
1086 if (retval < 0) { 1077 if (retval < 0)
1087 printk(KERN_ERR "sharedregion_entry_init failed: " 1078 pr_err("sharedregion_entry_init failed: status = 0x%x", retval);
1088 "status = 0x%x", retval);
1089 }
1090 return; 1079 return;
1091} 1080}
1092 1081
@@ -1124,7 +1113,7 @@ void *sharedregion_get_heap(u16 id)
1124 return (void *)heap; 1113 return (void *)heap;
1125 1114
1126error: 1115error:
1127 printk(KERN_ERR "sharedregion_get_heap failed: status = 0x%x", retval); 1116 pr_err("sharedregion_get_heap failed: status = 0x%x", retval);
1128 return (void *)NULL; 1117 return (void *)NULL;
1129} 1118}
1130 1119
@@ -1166,10 +1155,8 @@ u16 sharedregion_get_id(void *addr)
1166 mutex_unlock(sharedregion_module->local_lock); 1155 mutex_unlock(sharedregion_module->local_lock);
1167 1156
1168error: 1157error:
1169 if (retval < 0) { 1158 if (retval < 0)
1170 printk(KERN_ERR "sharedregion_get_id failed: " 1159 pr_err("sharedregion_get_id failed: status = 0x%x", retval);
1171 "status = 0x%x", retval);
1172 }
1173 return region_id; 1160 return region_id;
1174} 1161}
1175EXPORT_SYMBOL(sharedregion_get_id); 1162EXPORT_SYMBOL(sharedregion_get_id);
@@ -1213,7 +1200,7 @@ u16 sharedregion_get_id_by_name(char *name)
1213 1200
1214error: 1201error:
1215 if (retval < 0) { 1202 if (retval < 0) {
1216 printk(KERN_ERR "sharedregion_get_id_by_name failed: " 1203 pr_err("sharedregion_get_id_by_name failed: "
1217 "status = 0x%x", retval); 1204 "status = 0x%x", retval);
1218 } 1205 }
1219 return region_id; 1206 return region_id;
@@ -1248,7 +1235,7 @@ int sharedregion_get_entry(u16 id, struct sharedregion_entry *entry)
1248 return 0; 1235 return 0;
1249 1236
1250error: 1237error:
1251 printk(KERN_ERR "sharedregion_get_entry failed: status = 0x%x", retval); 1238 pr_err("sharedregion_get_entry failed: status = 0x%x", retval);
1252 return retval; 1239 return retval;
1253} 1240}
1254 1241
@@ -1287,7 +1274,7 @@ uint sharedregion_get_cache_line_size(u16 id)
1287 return cache_line_size; 1274 return cache_line_size;
1288 1275
1289error: 1276error:
1290 printk(KERN_ERR "sharedregion_get_cache_line_size failed: " 1277 pr_err("sharedregion_get_cache_line_size failed: "
1291 "status = 0x%x", retval); 1278 "status = 0x%x", retval);
1292 return cache_line_size; 1279 return cache_line_size;
1293} 1280}
@@ -1327,7 +1314,7 @@ bool sharedregion_is_cache_enabled(u16 id)
1327 return cache_enable; 1314 return cache_enable;
1328 1315
1329error: 1316error:
1330 printk(KERN_ERR "sharedregion_is_cache_enabled failed: " 1317 pr_err("sharedregion_is_cache_enabled failed: "
1331 "status = 0x%x", retval); 1318 "status = 0x%x", retval);
1332 return false; 1319 return false;
1333} 1320}
@@ -1379,7 +1366,7 @@ void *sharedregion_reserve_memory(u16 id, uint size)
1379 /* Need to make sure (cur_size + new_size) is smaller than region len */ 1366 /* Need to make sure (cur_size + new_size) is smaller than region len */
1380 if (region->entry.len < (cur_size + new_size)) { 1367 if (region->entry.len < (cur_size + new_size)) {
1381 retval = -EINVAL; 1368 retval = -EINVAL;
1382 printk(KERN_ERR "sharedregion_reserve_memory: Too large size " 1369 pr_err("sharedregion_reserve_memory: Too large size "
1383 "is requested to be reserved!"); 1370 "is requested to be reserved!");
1384 goto error; 1371 goto error;
1385 } 1372 }
@@ -1389,8 +1376,7 @@ void *sharedregion_reserve_memory(u16 id, uint size)
1389 return ret_ptr; 1376 return ret_ptr;
1390 1377
1391error: 1378error:
1392 printk(KERN_ERR "sharedregion_reserve_memory failed: " 1379 pr_err("sharedregion_reserve_memory failed: status = 0x%x", retval);
1393 "status = 0x%x", retval);
1394 return (void *)NULL; 1380 return (void *)NULL;
1395} 1381}
1396 1382
@@ -1439,7 +1425,7 @@ void sharedregion_unreserve_memory(u16 id, uint size)
1439 1425
1440error: 1426error:
1441 if (retval < 0) { 1427 if (retval < 0) {
1442 printk(KERN_ERR "sharedregion_unreserve_memory failed: " 1428 pr_err("sharedregion_unreserve_memory failed: "
1443 "status = 0x%x", retval); 1429 "status = 0x%x", retval);
1444 } 1430 }
1445 return; 1431 return;
@@ -1475,7 +1461,7 @@ static int _sharedregion_check_overlap(void *base, u32 len)
1475 if (base < (void *)((u32) region->entry.base 1461 if (base < (void *)((u32) region->entry.base
1476 + region->entry.len)) { 1462 + region->entry.len)) {
1477 retval = -1; 1463 retval = -1;
1478 printk(KERN_ERR "_sharedregion_check_" 1464 pr_err("_sharedregion_check_"
1479 "_overlap failed: Specified " 1465 "_overlap failed: Specified "
1480 "region falls within another " 1466 "region falls within another "
1481 "region!"); 1467 "region!");
@@ -1485,7 +1471,7 @@ static int _sharedregion_check_overlap(void *base, u32 len)
1485 if ((void *)((u32) base + len) > \ 1471 if ((void *)((u32) base + len) > \
1486 region->entry.base) { 1472 region->entry.base) {
1487 retval = -1; 1473 retval = -1;
1488 printk(KERN_ERR "_sharedregion_check_" 1474 pr_err("_sharedregion_check_"
1489 "_overlap failed: Specified " 1475 "_overlap failed: Specified "
1490 "region spans across multiple " 1476 "region spans across multiple "
1491 "regions!"); 1477 "regions!");
@@ -1499,8 +1485,7 @@ static int _sharedregion_check_overlap(void *base, u32 len)
1499 return 0; 1485 return 0;
1500 1486
1501error: 1487error:
1502 printk(KERN_ERR "_sharedregion_check_overlap failed: " 1488 pr_err("_sharedregion_check_overlap failed: status = 0x%x", retval);
1503 "status = 0x%x", retval);
1504 return retval; 1489 return retval;
1505} 1490}
1506 1491
@@ -1534,7 +1519,7 @@ static u32 _sharedregion_get_num_offset_bits(void)
1534 1519
1535error: 1520error:
1536 if (retval < 0) { 1521 if (retval < 0) {
1537 printk(KERN_ERR "_sharedregion_get_num_offset_bits failed: " 1522 pr_err("_sharedregion_get_num_offset_bits failed: "
1538 "status = 0x%x", retval); 1523 "status = 0x%x", retval);
1539 } 1524 }
1540 return num_offset_bits; 1525 return num_offset_bits;
@@ -1569,21 +1554,21 @@ int _sharedregion_set_entry(u16 id, struct sharedregion_entry *entry)
1569 retval = _sharedregion_check_overlap(region->entry.base, 1554 retval = _sharedregion_check_overlap(region->entry.base,
1570 region->entry.len); 1555 region->entry.len);
1571 if (retval < 0) { 1556 if (retval < 0) {
1572 printk(KERN_ERR "_sharedregion_set_entry: Entry is overlapping " 1557 pr_err("_sharedregion_set_entry: Entry is overlapping "
1573 "existing entry!"); 1558 "existing entry!");
1574 goto error; 1559 goto error;
1575 } 1560 }
1576 if (region->entry.is_valid) { 1561 if (region->entry.is_valid) {
1577 /*region entry should be invalid at this point */ 1562 /*region entry should be invalid at this point */
1578 retval = -EEXIST; 1563 retval = -EEXIST;
1579 printk(KERN_ERR "_sharedregion_set_entry: ntry already exists"); 1564 pr_err("_sharedregion_set_entry: ntry already exists");
1580 goto error; 1565 goto error;
1581 } 1566 }
1582 /* Fail if cacheEnabled and cache_line_size equal 0 */ 1567 /* Fail if cacheEnabled and cache_line_size equal 0 */
1583 if ((entry->cache_enable) && (entry->cache_line_size == 0)) { 1568 if ((entry->cache_enable) && (entry->cache_line_size == 0)) {
1584 /* if cache enabled, cache line size must != 0 */ 1569 /* if cache enabled, cache line size must != 0 */
1585 retval = -1; 1570 retval = -1;
1586 printk(KERN_ERR "_sharedregion_set_entry: If cache enabled, " 1571 pr_err("_sharedregion_set_entry: If cache enabled, "
1587 "cache line size must != 0"); 1572 "cache line size must != 0");
1588 goto error; 1573 goto error;
1589 } 1574 }
@@ -1599,7 +1584,6 @@ int _sharedregion_set_entry(u16 id, struct sharedregion_entry *entry)
1599 return 0; 1584 return 0;
1600 1585
1601error: 1586error:
1602 printk(KERN_ERR "_sharedregion_set_entry failed! status = 0x%x", 1587 pr_err("_sharedregion_set_entry failed! status = 0x%x", retval);
1603 retval);
1604 return retval; 1588 return retval;
1605} 1589}
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)
122 region.entry.base, 122 region.entry.base,
123 PLATFORM_MEM_XLT_FLAGS_VIRT2PHYS); 123 PLATFORM_MEM_XLT_FLAGS_VIRT2PHYS);
124 if (region.entry.base == NULL) { 124 if (region.entry.base == NULL) {
125 printk(KERN_ERR "sharedregion_ioctl_setup: " 125 pr_err("sharedregion_ioctl_setup: "
126 "failed to translate region virtual " 126 "failed to translate region virtual "
127 "address.\n"); 127 "address.\n");
128 status = -ENOMEM; 128 status = -ENOMEM;
@@ -192,7 +192,7 @@ static int sharedregion_ioctl_get_heap(struct sharedregion_cmd_args *cargs)
192 if (heap_handle != NULL) 192 if (heap_handle != NULL)
193 cargs->api_status = 0; 193 cargs->api_status = 0;
194 else { 194 else {
195 printk(KERN_ERR "sharedregion_ioctl_get_heap failed: " 195 pr_err("sharedregion_ioctl_get_heap failed: "
196 "heap_handle is NULL!"); 196 "heap_handle is NULL!");
197 cargs->api_status = -1; 197 cargs->api_status = -1;
198 } 198 }
@@ -223,7 +223,7 @@ static int sharedregion_ioctl_set_entry(struct sharedregion_cmd_args *cargs)
223 (void *)cargs->args.set_entry.entry.base, 223 (void *)cargs->args.set_entry.entry.base,
224 PLATFORM_MEM_XLT_FLAGS_PHYS2VIRT); 224 PLATFORM_MEM_XLT_FLAGS_PHYS2VIRT);
225 if (entry.base == NULL) { 225 if (entry.base == NULL) {
226 printk(KERN_ERR "sharedregion_ioctl_set_entry: failed to" 226 pr_err("sharedregion_ioctl_set_entry: failed to"
227 "translate region virtual address.\n"); 227 "translate region virtual address.\n");
228 status = -ENOMEM; 228 status = -ENOMEM;
229 goto exit; 229 goto exit;
@@ -280,7 +280,7 @@ static int sharedregion_ioctl_get_region_info(
280 region.entry.base, 280 region.entry.base,
281 PLATFORM_MEM_XLT_FLAGS_VIRT2PHYS); 281 PLATFORM_MEM_XLT_FLAGS_VIRT2PHYS);
282 if (region.entry.base == NULL) { 282 if (region.entry.base == NULL) {
283 printk(KERN_ERR 283 pr_err(
284 "sharedregion_ioctl_get_region_info: " 284 "sharedregion_ioctl_get_region_info: "
285 "failed to translate region virtual " 285 "failed to translate region virtual "
286 "address.\n"); 286 "address.\n");
@@ -555,9 +555,7 @@ int sharedregion_ioctl(struct inode *inode, struct file *filp,
555 } 555 }
556 556
557exit: 557exit:
558 if (status < 0) { 558 if (status < 0)
559 printk(KERN_ERR "sharedregion_ioctl failed! status = 0x%x", 559 pr_err("sharedregion_ioctl failed! status = 0x%x", status);
560 status);
561 }
562 return status; 560 return status;
563} 561}
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)
123 return; 123 return;
124 124
125err_exit: 125err_exit:
126 printk(KERN_ERR "sysmemmgr_get_config: Argument of type " 126 pr_err("sysmemmgr_get_config: Argument of type "
127 "(struct sysmemmgr_config *) passed is NULL\n"); 127 "(struct sysmemmgr_config *) passed is NULL\n");
128 return; 128 return;
129} 129}
@@ -195,21 +195,21 @@ int sysmemmgr_setup(struct sysmemmgr_config *config)
195 return 0; 195 return 0;
196 196
197err_mem_gate: 197err_mem_gate:
198 printk(KERN_ERR "sysmemmgr_setup: Failed to create gate handle\n"); 198 pr_err("sysmemmgr_setup: Failed to create gate handle\n");
199 goto exit; 199 goto exit;
200 200
201err_phys_addr: 201err_phys_addr:
202 printk(KERN_ERR "sysmemmgr_setup: Physical Base address of static " 202 pr_err("sysmemmgr_setup: Physical Base address of static "
203 "memory region is NULL\n"); 203 "memory region is NULL\n");
204 goto exit; 204 goto exit;
205 205
206err_virt_addr: 206err_virt_addr:
207 printk(KERN_ERR "sysmemmgr_setup: Virtual Base address of static " 207 pr_err("sysmemmgr_setup: Virtual Base address of static "
208 "memory region is NULL\n"); 208 "memory region is NULL\n");
209 goto exit; 209 goto exit;
210 210
211err_config: 211err_config:
212 printk(KERN_ERR "sysmemmgr_setup: Argument of type " 212 pr_err("sysmemmgr_setup: Argument of type "
213 "(struct sysmemmgr_config *) passed is NULL\n"); 213 "(struct sysmemmgr_config *) passed is NULL\n");
214 goto exit; 214 goto exit;
215 215
@@ -248,7 +248,7 @@ int sysmemmgr_destroy(void)
248 return 0; 248 return 0;
249 249
250err_exit: 250err_exit:
251 printk(KERN_ERR "sysmemgr_destroy: Module was not initialized\n"); 251 pr_err("sysmemgr_destroy: Module was not initialized\n");
252 return status; 252 return status;
253} 253}
254 254
@@ -337,10 +337,10 @@ void *sysmemmgr_alloc(u32 size, enum sysmemmgr_allocflag flag)
337 } 337 }
338 338
339err_exit: 339err_exit:
340 printk(KERN_ERR "sysmemgr_alloc: Module was not initialized\n"); 340 pr_err("sysmemgr_alloc: Module was not initialized\n");
341exit: 341exit:
342 if (WARN_ON(ret_ptr == NULL)) 342 if (WARN_ON(ret_ptr == NULL))
343 printk(KERN_ERR "sysmemmgr_alloc: Allocation failed\n"); 343 pr_err("sysmemmgr_alloc: Allocation failed\n");
344 return ret_ptr; 344 return ret_ptr;
345} 345}
346 346
@@ -398,7 +398,7 @@ int sysmemmgr_free(void *blk, u32 size, enum sysmemmgr_allocflag flag)
398 return 0; 398 return 0;
399 399
400err_exit: 400err_exit:
401 printk(KERN_ERR "sysmemgr_free: Module was not initialized\n"); 401 pr_err("sysmemgr_free: Module was not initialized\n");
402 return status; 402 return status;
403} 403}
404 404
@@ -449,8 +449,7 @@ void *sysmemmgr_translate(void *src_addr, enum sysmemmgr_xltflag flags)
449 449
450 default: 450 default:
451 { 451 {
452 printk(KERN_ALERT "sysmemmgr_translate: Unhandled translation " 452 pr_err("sysmemmgr_translate: Unhandled translation flag\n");
453 "flag\n");
454 } 453 }
455 break; 454 break;
456 } 455 }
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)
197 197
198 if (WARN_ON(config == NULL)) { 198 if (WARN_ON(config == NULL)) {
199 status = -EINVAL; 199 status = -EINVAL;
200 printk(KERN_ALERT "sysmgr_get_config [0x%x] : Argument of type" 200 pr_err("sysmgr_get_config [0x%x] : Argument of type"
201 " (sysmgr_get_config *) passed is null!", 201 " (sysmgr_get_config *) passed is null!",
202 status); 202 status);
203 return; 203 return;
@@ -384,10 +384,10 @@ s32 sysmgr_setup(const struct sysmgr_config *cfg)
384 /* Initialize PlatformMem */ 384 /* Initialize PlatformMem */
385 status = platform_mem_setup(); 385 status = platform_mem_setup();
386 if (status < 0) { 386 if (status < 0) {
387 printk(KERN_ERR "sysmgr_setup : platform_mem_setup " 387 pr_err("sysmgr_setup : platform_mem_setup "
388 "failed [0x%x]\n", status); 388 "failed [0x%x]\n", status);
389 } else { 389 } else {
390 printk(KERN_ERR "platform_mem_setup : status [0x%x]\n" , 390 pr_err("platform_mem_setup : status [0x%x]\n" ,
391 status); 391 status);
392 sysmgr_state.platform_mem_init_flag = true; 392 sysmgr_state.platform_mem_init_flag = true;
393 } 393 }
@@ -397,10 +397,10 @@ s32 sysmgr_setup(const struct sysmgr_config *cfg)
397 397
398 status = multiproc_setup(&(config->multiproc_cfg)); 398 status = multiproc_setup(&(config->multiproc_cfg));
399 if (status < 0) { 399 if (status < 0) {
400 printk(KERN_ERR "sysmgr_setup : multiproc_setup " 400 pr_err("sysmgr_setup : multiproc_setup "
401 "failed [0x%x]\n", status); 401 "failed [0x%x]\n", status);
402 } else { 402 } else {
403 printk(KERN_ERR "sysmgr_setup : status [0x%x]\n" , status); 403 pr_err("sysmgr_setup : status [0x%x]\n" , status);
404 sysmgr_state.multiproc_init_flag = true; 404 sysmgr_state.multiproc_init_flag = true;
405 } 405 }
406 406
@@ -408,10 +408,10 @@ s32 sysmgr_setup(const struct sysmgr_config *cfg)
408 if (status >= 0) { 408 if (status >= 0) {
409 status = proc_mgr_setup(&(config->proc_mgr_cfg)); 409 status = proc_mgr_setup(&(config->proc_mgr_cfg));
410 if (status < 0) { 410 if (status < 0) {
411 printk(KERN_ERR "sysmgr_setup : proc_mgr_setup " 411 pr_err("sysmgr_setup : proc_mgr_setup "
412 "failed [0x%x]\n", status); 412 "failed [0x%x]\n", status);
413 } else { 413 } else {
414 printk(KERN_ERR "proc_mgr_setup : status [0x%x]\n" , 414 pr_err("proc_mgr_setup : status [0x%x]\n" ,
415 status); 415 status);
416 sysmgr_state.proc_mgr_init_flag = true; 416 sysmgr_state.proc_mgr_init_flag = true;
417 } 417 }
@@ -421,10 +421,10 @@ s32 sysmgr_setup(const struct sysmgr_config *cfg)
421 if (status >= 0) { 421 if (status >= 0) {
422 status = sharedregion_setup(&config->sharedregion_cfg); 422 status = sharedregion_setup(&config->sharedregion_cfg);
423 if (status < 0) { 423 if (status < 0) {
424 printk(KERN_ERR "sysmgr_setup : sharedregion_setup " 424 pr_err("sysmgr_setup : sharedregion_setup "
425 "failed [0x%x]\n", status); 425 "failed [0x%x]\n", status);
426 } else { 426 } else {
427 printk(KERN_ERR "sharedregion_setup : status [0x%x]\n" , 427 pr_err("sharedregion_setup : status [0x%x]\n" ,
428 status); 428 status);
429 sysmgr_state.sharedregion_init_flag = true; 429 sysmgr_state.sharedregion_init_flag = true;
430 } 430 }
@@ -434,10 +434,10 @@ s32 sysmgr_setup(const struct sysmgr_config *cfg)
434 if (status >= 0) { 434 if (status >= 0) {
435 status = notify_setup(&config->notify_cfg); 435 status = notify_setup(&config->notify_cfg);
436 if (status < 0) { 436 if (status < 0) {
437 printk(KERN_ERR "sysmgr_setup : notify_setup " 437 pr_err("sysmgr_setup : notify_setup "
438 "failed [0x%x]\n", status); 438 "failed [0x%x]\n", status);
439 } else { 439 } else {
440 printk(KERN_ERR "notify_setup : status [0x%x]\n" , 440 pr_err("notify_setup : status [0x%x]\n" ,
441 status); 441 status);
442 sysmgr_state.notify_init_flag = true; 442 sysmgr_state.notify_init_flag = true;
443 } 443 }
@@ -447,10 +447,10 @@ s32 sysmgr_setup(const struct sysmgr_config *cfg)
447 if (status >= 0) { 447 if (status >= 0) {
448 status = nameserver_setup(); 448 status = nameserver_setup();
449 if (status < 0) { 449 if (status < 0) {
450 printk(KERN_ERR "sysmgr_setup : nameserver_setup " 450 pr_err("sysmgr_setup : nameserver_setup "
451 "failed [0x%x]\n", status); 451 "failed [0x%x]\n", status);
452 } else { 452 } else {
453 printk(KERN_ERR "nameserver_setup : status [0x%x]\n" , 453 pr_err("nameserver_setup : status [0x%x]\n" ,
454 status); 454 status);
455 sysmgr_state.nameserver_init_flag = true; 455 sysmgr_state.nameserver_init_flag = true;
456 } 456 }
@@ -460,10 +460,10 @@ s32 sysmgr_setup(const struct sysmgr_config *cfg)
460 if (status >= 0) { 460 if (status >= 0) {
461 status = gatepeterson_setup(&config->gatepeterson_cfg); 461 status = gatepeterson_setup(&config->gatepeterson_cfg);
462 if (status < 0) { 462 if (status < 0) {
463 printk(KERN_ERR "sysmgr_setup : gatepeterson_setup " 463 pr_err("sysmgr_setup : gatepeterson_setup "
464 "failed [0x%x]\n", status); 464 "failed [0x%x]\n", status);
465 } else { 465 } else {
466 printk(KERN_ERR "gatepeterson_setup : status [0x%x]\n" , 466 pr_err("gatepeterson_setup : status [0x%x]\n" ,
467 status); 467 status);
468 sysmgr_state.gatepeterson_init_flag = true; 468 sysmgr_state.gatepeterson_init_flag = true;
469 } 469 }
@@ -473,10 +473,10 @@ s32 sysmgr_setup(const struct sysmgr_config *cfg)
473 if (status >= 0) { 473 if (status >= 0) {
474 status = messageq_setup(&config->messageq_cfg); 474 status = messageq_setup(&config->messageq_cfg);
475 if (status < 0) { 475 if (status < 0) {
476 printk(KERN_ERR "sysmgr_setup : messageq_setup " 476 pr_err("sysmgr_setup : messageq_setup "
477 "failed [0x%x]\n", status); 477 "failed [0x%x]\n", status);
478 } else { 478 } else {
479 printk(KERN_ERR "messageq_setup : status [0x%x]\n" , 479 pr_err("messageq_setup : status [0x%x]\n" ,
480 status); 480 status);
481 sysmgr_state.messageq_init_flag = true; 481 sysmgr_state.messageq_init_flag = true;
482 } 482 }
@@ -486,10 +486,10 @@ s32 sysmgr_setup(const struct sysmgr_config *cfg)
486 if (status >= 0) { 486 if (status >= 0) {
487 status = heapbuf_setup(&config->heapbuf_cfg); 487 status = heapbuf_setup(&config->heapbuf_cfg);
488 if (status < 0) { 488 if (status < 0) {
489 printk(KERN_ERR "sysmgr_setup : heapbuf_setup " 489 pr_err("sysmgr_setup : heapbuf_setup "
490 "failed [0x%x]\n", status); 490 "failed [0x%x]\n", status);
491 } else { 491 } else {
492 printk(KERN_ERR "heapbuf_setup : status [0x%x]\n" , 492 pr_err("heapbuf_setup : status [0x%x]\n" ,
493 status); 493 status);
494 sysmgr_state.heapbuf_init_flag = true; 494 sysmgr_state.heapbuf_init_flag = true;
495 } 495 }
@@ -500,11 +500,11 @@ s32 sysmgr_setup(const struct sysmgr_config *cfg)
500 status = listmp_sharedmemory_setup( 500 status = listmp_sharedmemory_setup(
501 &config->listmp_sharedmemory_cfg); 501 &config->listmp_sharedmemory_cfg);
502 if (status < 0) { 502 if (status < 0) {
503 printk(KERN_ERR "sysmgr_setup : " 503 pr_err("sysmgr_setup : "
504 "listmp_sharedmemory_setup failed [0x%x]\n", 504 "listmp_sharedmemory_setup failed [0x%x]\n",
505 status); 505 status);
506 } else { 506 } else {
507 printk(KERN_ERR "listmp_sharedmemory_setup : " 507 pr_err("listmp_sharedmemory_setup : "
508 "status [0x%x]\n" , status); 508 "status [0x%x]\n" , status);
509 sysmgr_state.listmp_sharedmemory_init_flag = true; 509 sysmgr_state.listmp_sharedmemory_init_flag = true;
510 } 510 }
@@ -515,11 +515,11 @@ s32 sysmgr_setup(const struct sysmgr_config *cfg)
515 status = messageq_transportshm_setup( 515 status = messageq_transportshm_setup(
516 &config->messageq_transportshm_cfg); 516 &config->messageq_transportshm_cfg);
517 if (status < 0) { 517 if (status < 0) {
518 printk(KERN_ERR "sysmgr_setup : " 518 pr_err("sysmgr_setup : "
519 "messageq_transportshm_setup failed [0x%x]\n", 519 "messageq_transportshm_setup failed [0x%x]\n",
520 status); 520 status);
521 } else { 521 } else {
522 printk(KERN_ERR "messageq_transportshm_setup : " 522 pr_err("messageq_transportshm_setup : "
523 "status [0x%x]\n", status); 523 "status [0x%x]\n", status);
524 sysmgr_state.messageq_transportshm_init_flag = true; 524 sysmgr_state.messageq_transportshm_init_flag = true;
525 } 525 }
@@ -529,11 +529,11 @@ s32 sysmgr_setup(const struct sysmgr_config *cfg)
529 if (status >= 0) { 529 if (status >= 0) {
530 status = notify_ducatidrv_setup(&config->notify_ducatidrv_cfg); 530 status = notify_ducatidrv_setup(&config->notify_ducatidrv_cfg);
531 if (status < 0) { 531 if (status < 0) {
532 printk(KERN_ERR "sysmgr_setup : " 532 pr_err("sysmgr_setup : "
533 "notify_ducatidrv_setup failed [0x%x]\n", 533 "notify_ducatidrv_setup failed [0x%x]\n",
534 status); 534 status);
535 } else { 535 } else {
536 printk(KERN_ERR "notify_ducatidrv_setup : " 536 pr_err("notify_ducatidrv_setup : "
537 "status [0x%x]\n" , status); 537 "status [0x%x]\n" , status);
538 sysmgr_state.notify_ducatidrv_init_flag = true; 538 sysmgr_state.notify_ducatidrv_init_flag = true;
539 } 539 }
@@ -544,11 +544,11 @@ s32 sysmgr_setup(const struct sysmgr_config *cfg)
544 status = nameserver_remotenotify_setup( 544 status = nameserver_remotenotify_setup(
545 &config->nameserver_remotenotify_cfg); 545 &config->nameserver_remotenotify_cfg);
546 if (status < 0) { 546 if (status < 0) {
547 printk(KERN_ERR "sysmgr_setup : " 547 pr_err("sysmgr_setup : "
548 "nameserver_remotenotify_setup failed [0x%x]\n", 548 "nameserver_remotenotify_setup failed [0x%x]\n",
549 status); 549 status);
550 } else { 550 } else {
551 printk(KERN_ERR "nameserver_remotenotify_setup : " 551 pr_err("nameserver_remotenotify_setup : "
552 "status [0x%x]\n" , status); 552 "status [0x%x]\n" , status);
553 sysmgr_state.nameserver_remotenotify_init_flag = true; 553 sysmgr_state.nameserver_remotenotify_init_flag = true;
554 } 554 }
@@ -558,10 +558,10 @@ s32 sysmgr_setup(const struct sysmgr_config *cfg)
558 /* Call platform setup function */ 558 /* Call platform setup function */
559 status = platform_setup(config); 559 status = platform_setup(config);
560 if (status < 0) { 560 if (status < 0) {
561 printk(KERN_ERR "sysmgr_setup : platform_setup " 561 pr_err("sysmgr_setup : platform_setup "
562 "failed [0x%x]\n", status); 562 "failed [0x%x]\n", status);
563 } else { 563 } else {
564 printk(KERN_ERR "platform_setup : status [0x%x]\n" , 564 pr_err("platform_setup : status [0x%x]\n" ,
565 status); 565 status);
566 sysmgr_state.platform_init_flag = true; 566 sysmgr_state.platform_init_flag = true;
567 } 567 }
@@ -602,7 +602,7 @@ s32 sysmgr_destroy(void)
602 if (sysmgr_state.platform_init_flag == true) { 602 if (sysmgr_state.platform_init_flag == true) {
603 status = platform_destroy(); 603 status = platform_destroy();
604 if (status < 0) { 604 if (status < 0) {
605 printk(KERN_ERR "sysmgr_destroy : platform_destroy " 605 pr_err("sysmgr_destroy : platform_destroy "
606 "failed [0x%x]\n", status); 606 "failed [0x%x]\n", status);
607 } else { 607 } else {
608 sysmgr_state.platform_init_flag = false; 608 sysmgr_state.platform_init_flag = false;
@@ -613,7 +613,7 @@ s32 sysmgr_destroy(void)
613 if (sysmgr_state.nameserver_remotenotify_init_flag == true) { 613 if (sysmgr_state.nameserver_remotenotify_init_flag == true) {
614 status = nameserver_remotenotify_destroy(); 614 status = nameserver_remotenotify_destroy();
615 if (status < 0) { 615 if (status < 0) {
616 printk(KERN_ERR "sysmgr_destroy : " 616 pr_err("sysmgr_destroy : "
617 "nameserver_remotenotify_destroy " 617 "nameserver_remotenotify_destroy "
618 "failed [0x%x]\n", status); 618 "failed [0x%x]\n", status);
619 } else { 619 } else {
@@ -626,7 +626,7 @@ s32 sysmgr_destroy(void)
626 if (sysmgr_state.notify_ducatidrv_init_flag == true) { 626 if (sysmgr_state.notify_ducatidrv_init_flag == true) {
627 status = notify_ducatidrv_destroy(); 627 status = notify_ducatidrv_destroy();
628 if (status < 0) { 628 if (status < 0) {
629 printk(KERN_ERR "sysmgr_destroy : " 629 pr_err("sysmgr_destroy : "
630 "notify_ducatidrv_destroy failed [0x%x]\n", 630 "notify_ducatidrv_destroy failed [0x%x]\n",
631 status); 631 status);
632 } else { 632 } else {
@@ -638,7 +638,7 @@ s32 sysmgr_destroy(void)
638 if (sysmgr_state.messageq_transportshm_init_flag == true) { 638 if (sysmgr_state.messageq_transportshm_init_flag == true) {
639 status = messageq_transportshm_destroy(); 639 status = messageq_transportshm_destroy();
640 if (status < 0) { 640 if (status < 0) {
641 printk(KERN_ERR "sysmgr_destroy : " 641 pr_err("sysmgr_destroy : "
642 "messageq_transportshm_destroy failed [0x%x]\n", 642 "messageq_transportshm_destroy failed [0x%x]\n",
643 status); 643 status);
644 } else { 644 } else {
@@ -651,7 +651,7 @@ s32 sysmgr_destroy(void)
651 if (sysmgr_state.listmp_sharedmemory_init_flag == true) { 651 if (sysmgr_state.listmp_sharedmemory_init_flag == true) {
652 status = listmp_sharedmemory_destroy(); 652 status = listmp_sharedmemory_destroy();
653 if (status < 0) { 653 if (status < 0) {
654 printk(KERN_ERR "sysmgr_destroy : " 654 pr_err("sysmgr_destroy : "
655 "listmp_sharedmemory_destroy failed [0x%x]\n", 655 "listmp_sharedmemory_destroy failed [0x%x]\n",
656 status); 656 status);
657 } else { 657 } else {
@@ -664,7 +664,7 @@ s32 sysmgr_destroy(void)
664 if (sysmgr_state.heapbuf_init_flag == true) { 664 if (sysmgr_state.heapbuf_init_flag == true) {
665 status = heapbuf_destroy(); 665 status = heapbuf_destroy();
666 if (status < 0) { 666 if (status < 0) {
667 printk(KERN_ERR "sysmgr_destroy : heapbuf_destroy " 667 pr_err("sysmgr_destroy : heapbuf_destroy "
668 "failed [0x%x]\n", status); 668 "failed [0x%x]\n", status);
669 } else { 669 } else {
670 sysmgr_state.heapbuf_init_flag = false; 670 sysmgr_state.heapbuf_init_flag = false;
@@ -675,7 +675,7 @@ s32 sysmgr_destroy(void)
675 if (sysmgr_state.messageq_init_flag == true) { 675 if (sysmgr_state.messageq_init_flag == true) {
676 status = messageq_destroy(); 676 status = messageq_destroy();
677 if (status < 0) { 677 if (status < 0) {
678 printk(KERN_ERR "sysmgr_destroy : messageq_destroy " 678 pr_err("sysmgr_destroy : messageq_destroy "
679 "failed [0x%x]\n", status); 679 "failed [0x%x]\n", status);
680 } else { 680 } else {
681 sysmgr_state.messageq_init_flag = false; 681 sysmgr_state.messageq_init_flag = false;
@@ -686,7 +686,7 @@ s32 sysmgr_destroy(void)
686 if (sysmgr_state.gatepeterson_init_flag == true) { 686 if (sysmgr_state.gatepeterson_init_flag == true) {
687 status = gatepeterson_destroy(); 687 status = gatepeterson_destroy();
688 if (status < 0) { 688 if (status < 0) {
689 printk(KERN_ERR "sysmgr_destroy : " 689 pr_err("sysmgr_destroy : "
690 "gatepeterson_destroy failed [0x%x]\n", status); 690 "gatepeterson_destroy failed [0x%x]\n", status);
691 } else { 691 } else {
692 sysmgr_state.gatepeterson_init_flag = false; 692 sysmgr_state.gatepeterson_init_flag = false;
@@ -697,7 +697,7 @@ s32 sysmgr_destroy(void)
697 if (sysmgr_state.nameserver_init_flag == true) { 697 if (sysmgr_state.nameserver_init_flag == true) {
698 status = nameserver_destroy(); 698 status = nameserver_destroy();
699 if (status < 0) { 699 if (status < 0) {
700 printk(KERN_ERR "sysmgr_destroy : nameserver_destroy " 700 pr_err("sysmgr_destroy : nameserver_destroy "
701 "failed [0x%x]\n", status); 701 "failed [0x%x]\n", status);
702 } else { 702 } else {
703 sysmgr_state.nameserver_init_flag = false; 703 sysmgr_state.nameserver_init_flag = false;
@@ -708,7 +708,7 @@ s32 sysmgr_destroy(void)
708 if (sysmgr_state.notify_init_flag == true) { 708 if (sysmgr_state.notify_init_flag == true) {
709 status = notify_destroy(); 709 status = notify_destroy();
710 if (status < 0) { 710 if (status < 0) {
711 printk(KERN_ERR "sysmgr_destroy : sysmgr_destroy " 711 pr_err("sysmgr_destroy : sysmgr_destroy "
712 "failed [0x%x]\n", status); 712 "failed [0x%x]\n", status);
713 } else { 713 } else {
714 sysmgr_state.notify_init_flag = false; 714 sysmgr_state.notify_init_flag = false;
@@ -719,7 +719,7 @@ s32 sysmgr_destroy(void)
719 if (sysmgr_state.sharedregion_init_flag == true) { 719 if (sysmgr_state.sharedregion_init_flag == true) {
720 status = sharedregion_destroy(); 720 status = sharedregion_destroy();
721 if (status < 0) { 721 if (status < 0) {
722 printk(KERN_ERR "sysmgr_destroy : " 722 pr_err("sysmgr_destroy : "
723 "sharedregion_destroy failed [0x%x]\n", status); 723 "sharedregion_destroy failed [0x%x]\n", status);
724 } else { 724 } else {
725 sysmgr_state.sharedregion_init_flag = false; 725 sysmgr_state.sharedregion_init_flag = false;
@@ -730,7 +730,7 @@ s32 sysmgr_destroy(void)
730 if (sysmgr_state.proc_mgr_init_flag == true) { 730 if (sysmgr_state.proc_mgr_init_flag == true) {
731 status = proc_mgr_destroy(); 731 status = proc_mgr_destroy();
732 if (status < 0) { 732 if (status < 0) {
733 printk(KERN_ERR "sysmgr_destroy : proc_mgr_destroy " 733 pr_err("sysmgr_destroy : proc_mgr_destroy "
734 "failed [0x%x]\n", status); 734 "failed [0x%x]\n", status);
735 } else { 735 } else {
736 sysmgr_state.proc_mgr_init_flag = false; 736 sysmgr_state.proc_mgr_init_flag = false;
@@ -741,7 +741,7 @@ s32 sysmgr_destroy(void)
741 if (sysmgr_state.multiproc_init_flag == true) { 741 if (sysmgr_state.multiproc_init_flag == true) {
742 status = multiproc_destroy(); 742 status = multiproc_destroy();
743 if (status < 0) { 743 if (status < 0) {
744 printk(KERN_ERR "sysmgr_destroy : multiproc_destroy " 744 pr_err("sysmgr_destroy : multiproc_destroy "
745 "failed [0x%x]\n", status); 745 "failed [0x%x]\n", status);
746 } else { 746 } else {
747 sysmgr_state.proc_mgr_init_flag = false; 747 sysmgr_state.proc_mgr_init_flag = false;
@@ -752,7 +752,7 @@ s32 sysmgr_destroy(void)
752 if (sysmgr_state.platform_mem_init_flag == true) { 752 if (sysmgr_state.platform_mem_init_flag == true) {
753 status = platform_mem_destroy(); 753 status = platform_mem_destroy();
754 if (status < 0) { 754 if (status < 0) {
755 printk(KERN_ERR "sysmgr_destroy : platform_mem_destroy " 755 pr_err("sysmgr_destroy : platform_mem_destroy "
756 "failed [0x%x]\n", status); 756 "failed [0x%x]\n", status);
757 } else { 757 } else {
758 sysmgr_state.platform_mem_init_flag = false; 758 sysmgr_state.platform_mem_init_flag = false;
@@ -763,7 +763,7 @@ s32 sysmgr_destroy(void)
763 763
764exit: 764exit:
765 if (status < 0) { 765 if (status < 0) {
766 printk(KERN_ERR "sysmgr_destroy : failed with " 766 pr_err("sysmgr_destroy : failed with "
767 "status = [0x%x]\n", status); 767 "status = [0x%x]\n", status);
768 } 768 }
769 return status; 769 return status;
@@ -781,7 +781,7 @@ void sysmgr_set_boot_load_page(u16 proc_id, u32 boot_load_page)
781 (struct sysmgr_boot_load_page *) boot_load_page; 781 (struct sysmgr_boot_load_page *) boot_load_page;
782 782
783 if ((proc_id < 0) || (proc_id >= MULTIPROC_MAXPROCESSORS)) { 783 if ((proc_id < 0) || (proc_id >= MULTIPROC_MAXPROCESSORS)) {
784 printk(KERN_ERR 784 pr_err(
785 "sysmgr_set_boot_load_page failed: Invalid proc_id passed\n"); 785 "sysmgr_set_boot_load_page failed: Invalid proc_id passed\n");
786 return; 786 return;
787 } 787 }
@@ -804,17 +804,17 @@ void sysmgr_wait_for_scalability_info(u16 proc_id)
804 VOLATILE struct sysmgr_boot_load_page *temp = NULL; 804 VOLATILE struct sysmgr_boot_load_page *temp = NULL;
805 805
806 if ((proc_id < 0) || (proc_id >= MULTIPROC_MAXPROCESSORS)) { 806 if ((proc_id < 0) || (proc_id >= MULTIPROC_MAXPROCESSORS)) {
807 printk(KERN_ERR "sysmgr_wait_for_scalability_info failed: " 807 pr_err("sysmgr_wait_for_scalability_info failed: "
808 "Invalid proc_id passed\n"); 808 "Invalid proc_id passed\n");
809 return; 809 return;
810 } 810 }
811 temp = sysmgr_state.boot_load_page[proc_id]; 811 temp = sysmgr_state.boot_load_page[proc_id];
812 812
813 printk(KERN_ERR "sysmgr_wait_for_scalability_info: BF while temp->handshake:%x\n", 813 pr_err("sysmgr_wait_for_scalability_info: BF while temp->handshake:%x\n",
814 temp->handshake); 814 temp->handshake);
815 while (temp->handshake != SYSMGR_SCALABILITYHANDSHAKESTAMP) 815 while (temp->handshake != SYSMGR_SCALABILITYHANDSHAKESTAMP)
816 ; 816 ;
817 printk(KERN_ERR "sysmgr_wait_for_scalability_info:AF while temp->handshake:%x\n", 817 pr_err("sysmgr_wait_for_scalability_info:AF while temp->handshake:%x\n",
818 temp->handshake); 818 temp->handshake);
819 819
820 /* Reset the handshake value for reverse synchronization */ 820 /* Reset the handshake value for reverse synchronization */
@@ -832,7 +832,7 @@ void sysmgr_wait_for_slave_setup(u16 proc_id)
832 VOLATILE struct sysmgr_boot_load_page *temp = NULL; 832 VOLATILE struct sysmgr_boot_load_page *temp = NULL;
833 833
834 if ((proc_id < 0) || (proc_id >= MULTIPROC_MAXPROCESSORS)) { 834 if ((proc_id < 0) || (proc_id >= MULTIPROC_MAXPROCESSORS)) {
835 printk(KERN_ERR "sysmgr_wait_for_slave_setup failed: " 835 pr_err("sysmgr_wait_for_slave_setup failed: "
836 "Invalid proc_id passed\n"); 836 "Invalid proc_id passed\n");
837 return; 837 return;
838 } 838 }
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)
202 return; 202 return;
203 203
204exit: 204exit:
205 printk(KERN_ERR "transportshm_get_config: Argument of type" 205 pr_err("transportshm_get_config: Argument of type"
206 "(struct transportshm_config *) passed is null!\n"); 206 "(struct transportshm_config *) passed is null!\n");
207} 207}
208 208
@@ -253,8 +253,7 @@ int transportshm_setup(const struct transportshm_config *cfg)
253 /* @retval TRANSPORTSHM_E_FAIL Failed to create 253 /* @retval TRANSPORTSHM_E_FAIL Failed to create
254 GateMutex! */ 254 GateMutex! */
255 status = TRANSPORTSHM_E_FAIL; 255 status = TRANSPORTSHM_E_FAIL;
256 printk(KERN_ERR "transportshm_setup: Failed to create " 256 pr_err("transportshm_setup: Failed to create mutex!\n");
257 "mutex!\n");
258 atomic_set(&transportshm_module->ref_count, 257 atomic_set(&transportshm_module->ref_count,
259 TRANSPORTSHM_MAKE_MAGICSTAMP(0)); 258 TRANSPORTSHM_MAKE_MAGICSTAMP(0));
260 goto exit; 259 goto exit;
@@ -269,8 +268,7 @@ int transportshm_setup(const struct transportshm_config *cfg)
269 return status; 268 return status;
270 269
271exit: 270exit:
272 printk(KERN_ERR "transportshm_setup failed: status = 0x%x", 271 pr_err("transportshm_setup failed: status = 0x%x", status);
273 status);
274 return status; 272 return status;
275} 273}
276 274
@@ -343,8 +341,7 @@ int transportshm_destroy(void)
343 341
344exit: 342exit:
345 if (status < 0) 343 if (status < 0)
346 printk(KERN_ERR "transportshm_destroy failed: " 344 pr_err("transportshm_destroy failed: status = 0x%x\n", status);
347 "status = 0x%x\n", status);
348 return status; 345 return status;
349} 346}
350 347
@@ -360,13 +357,13 @@ void transportshm_params_init(struct transportshm_params *params)
360 &(transportshm_module->ref_count), 357 &(transportshm_module->ref_count),
361 TRANSPORTSHM_MAKE_MAGICSTAMP(0), 358 TRANSPORTSHM_MAKE_MAGICSTAMP(0),
362 TRANSPORTSHM_MAKE_MAGICSTAMP(1)) == true)) { 359 TRANSPORTSHM_MAKE_MAGICSTAMP(1)) == true)) {
363 printk(KERN_ERR "transportshm_params_init: Module was " 360 pr_err("transportshm_params_init: Module was "
364 " not initialized\n"); 361 " not initialized\n");
365 goto exit; 362 goto exit;
366 } 363 }
367 364
368 if (WARN_ON(params == NULL)) { 365 if (WARN_ON(params == NULL)) {
369 printk(KERN_ERR "transportshm_params_init: Argument of" 366 pr_err("transportshm_params_init: Argument of"
370 " type (struct transportshm_params *) " 367 " type (struct transportshm_params *) "
371 "is NULL!"); 368 "is NULL!");
372 goto exit; 369 goto exit;
@@ -423,8 +420,7 @@ void *transportshm_create(u16 proc_id,
423 return handle; 420 return handle;
424 421
425exit: 422exit:
426 printk(KERN_ERR "transportshm_create failed: status = 0x%x\n", 423 pr_err("transportshm_create failed: status = 0x%x\n", status);
427 status);
428 return handle; 424 return handle;
429} 425}
430 426
@@ -455,7 +451,7 @@ int transportshm_delete(void **handle_ptr)
455 } 451 }
456 if (WARN_ON(*handle_ptr == NULL)) { 452 if (WARN_ON(*handle_ptr == NULL)) {
457 status = -EINVAL; 453 status = -EINVAL;
458 printk(KERN_WARNING "transportshm_delete: Invalid NULL" 454 pr_warn("transportshm_delete: Invalid NULL"
459 " mqtshm_handle specified! status = 0x%x\n", status); 455 " mqtshm_handle specified! status = 0x%x\n", status);
460 goto exit; 456 goto exit;
461 } 457 }
@@ -487,7 +483,7 @@ int transportshm_delete(void **handle_ptr)
487 if (handle->local_list != NULL) { 483 if (handle->local_list != NULL) {
488 status = listmp_delete(&handle->local_list); 484 status = listmp_delete(&handle->local_list);
489 if (status < 0) 485 if (status < 0)
490 printk(KERN_WARNING "transportshm_delete: " 486 pr_warn("transportshm_delete: "
491 "Failed to delete local listmp " 487 "Failed to delete local listmp "
492 "instance!\n"); 488 "instance!\n");
493 } 489 }
@@ -496,7 +492,7 @@ int transportshm_delete(void **handle_ptr)
496 tmp_status = listmp_close(&handle->remote_list); 492 tmp_status = listmp_close(&handle->remote_list);
497 if ((tmp_status < 0) && (status >= 0)) { 493 if ((tmp_status < 0) && (status >= 0)) {
498 status = tmp_status; 494 status = tmp_status;
499 printk(KERN_WARNING "transportshm_delete: " 495 pr_warn("transportshm_delete: "
500 "Failed to close remote listmp " 496 "Failed to close remote listmp "
501 "instance!\n"); 497 "instance!\n");
502 } 498 }
@@ -511,7 +507,7 @@ int transportshm_delete(void **handle_ptr)
511 handle->notify_event_id); 507 handle->notify_event_id);
512 if (tmp_status < 0) { 508 if (tmp_status < 0) {
513 status = tmp_status; 509 status = tmp_status;
514 printk(KERN_WARNING "transportshm_delete: Failed to " 510 pr_warn("transportshm_delete: Failed to "
515 "unregister notify event!\n"); 511 "unregister notify event!\n");
516 } 512 }
517 513
@@ -523,7 +519,7 @@ int transportshm_delete(void **handle_ptr)
523 519
524exit: 520exit:
525 if (status < 0) 521 if (status < 0)
526 printk(KERN_ERR "transportshm_delete failed: " 522 pr_err("transportshm_delete failed: "
527 "status = 0x%x\n", status); 523 "status = 0x%x\n", status);
528 return status; 524 return status;
529} 525}
@@ -605,8 +601,7 @@ transportshm_open_by_addr(void *shared_addr, void **handle_ptr)
605 return status; 601 return status;
606 602
607exit: 603exit:
608 printk(KERN_ERR "transportshm_open_by_addr failed: status = 0x%x\n", 604 pr_err("transportshm_open_by_addr failed: status = 0x%x\n", status);
609 status);
610 return status; 605 return status;
611} 606}
612 607
@@ -659,7 +654,7 @@ transportshm_close(void **handle_ptr)
659 status = gatemp_close(&obj->gate); 654 status = gatemp_close(&obj->gate);
660 if (status < 0) { 655 if (status < 0) {
661 status = TRANSPORTSHM_E_FAIL; 656 status = TRANSPORTSHM_E_FAIL;
662 printk(KERN_ERR "transportshm_close: " 657 pr_err("transportshm_close: "
663 "gatemp_close failed, status [0x%x]\n", 658 "gatemp_close failed, status [0x%x]\n",
664 status); 659 status);
665 } 660 }
@@ -669,7 +664,7 @@ transportshm_close(void **handle_ptr)
669 tmp_status = listmp_close(&obj->local_list); 664 tmp_status = listmp_close(&obj->local_list);
670 if ((tmp_status < 0) && (status >= 0)) { 665 if ((tmp_status < 0) && (status >= 0)) {
671 status = TRANSPORTSHM_E_FAIL; 666 status = TRANSPORTSHM_E_FAIL;
672 printk(KERN_ERR "transportshm_close: " 667 pr_err("transportshm_close: "
673 "listmp_close(local_list) failed, " 668 "listmp_close(local_list) failed, "
674 "status [0x%x]\n", status); 669 "status [0x%x]\n", status);
675 } 670 }
@@ -679,7 +674,7 @@ transportshm_close(void **handle_ptr)
679 tmp_status = listmp_close(&obj->remote_list); 674 tmp_status = listmp_close(&obj->remote_list);
680 if ((tmp_status < 0) && (status >= 0)) { 675 if ((tmp_status < 0) && (status >= 0)) {
681 status = TRANSPORTSHM_E_FAIL; 676 status = TRANSPORTSHM_E_FAIL;
682 printk(KERN_ERR "transportshm_close: " 677 pr_err("transportshm_close: "
683 "listmp_close(remote_list) failed, " 678 "listmp_close(remote_list) failed, "
684 "status [0x%x]\n", status); 679 "status [0x%x]\n", status);
685 } 680 }
@@ -697,8 +692,7 @@ transportshm_close(void **handle_ptr)
697 *handle_ptr = NULL; 692 *handle_ptr = NULL;
698exit: 693exit:
699 if (status < 0) 694 if (status < 0)
700 printk(KERN_ERR "transportshm_close failed: status = 0x%x\n", 695 pr_err("transportshm_close failed: status = 0x%x\n", status);
701 status);
702 return status; 696 return status;
703} 697}
704 698
@@ -744,7 +738,7 @@ int transportshm_put(void *handle, void *msg)
744 /*key = gatemp_enter(obj->gate);*/ 738 /*key = gatemp_enter(obj->gate);*/
745 status = listmp_put_tail(obj->remote_list, (struct listmp_elem *) msg); 739 status = listmp_put_tail(obj->remote_list, (struct listmp_elem *) msg);
746 if (status < 0) { 740 if (status < 0) {
747 printk(KERN_ERR "transportshm_put: Failed to put " 741 pr_err("transportshm_put: Failed to put "
748 "message in the shared list! status = 0x%x\n", status); 742 "message in the shared list! status = 0x%x\n", status);
749 goto exit_with_gate; 743 goto exit_with_gate;
750 } 744 }
@@ -758,7 +752,7 @@ int transportshm_put(void *handle, void *msg)
758 752
759 753
760notify_send_fail: 754notify_send_fail:
761 printk(KERN_ERR "transportshm_put: Notification to remote " 755 pr_err("transportshm_put: Notification to remote "
762 "processor failed, status = 0x%x\n", status); 756 "processor failed, status = 0x%x\n", status);
763 /* If sending the event failed, then remove the element from the */ 757 /* If sending the event failed, then remove the element from the */
764 /* list. Ignore the status of remove. */ 758 /* list. Ignore the status of remove. */
@@ -768,8 +762,7 @@ exit_with_gate:
768 /*gatemp_leave(obj->gate, key);*/ 762 /*gatemp_leave(obj->gate, key);*/
769exit: 763exit:
770 if (status < 0) 764 if (status < 0)
771 printk(KERN_ERR "transportshm_put failed: " 765 pr_err("transportshm_put failed: status = 0x%x\n", status);
772 "status = 0x%x\n", status);
773 return status; 766 return status;
774} 767}
775 768
@@ -782,7 +775,7 @@ int transportshm_control(void *handle, u32 cmd, u32 *cmd_arg)
782{ 775{
783 BUG_ON(handle == NULL); 776 BUG_ON(handle == NULL);
784 777
785 printk(KERN_ALERT "transportshm_control not supported!\n"); 778 pr_err("transportshm_control not supported!\n");
786 return TRANSPORTSHM_E_NOTSUPPORTED; 779 return TRANSPORTSHM_E_NOTSUPPORTED;
787} 780}
788 781
@@ -845,7 +838,7 @@ u32 transportshm_shared_mem_req(const struct transportshm_params *params)
845 838
846exit: 839exit:
847 if (status < 0) 840 if (status < 0)
848 printk(KERN_ERR "transportshm_shared_mem_req failed: " 841 pr_err("transportshm_shared_mem_req failed: "
849 "status = 0x%x\n", status); 842 "status = 0x%x\n", status);
850 843
851 return mem_req; 844 return mem_req;
@@ -902,8 +895,7 @@ static void _transportshm_notify_fxn(u16 proc_id, u16 line_id, u32 event_no,
902exit: 895exit:
903 mutex_unlock(transportshm_state.gate_handle); 896 mutex_unlock(transportshm_state.gate_handle);
904mutex_fail: 897mutex_fail:
905 printk(KERN_ERR "transportshm_notify_fxn: argument passed is " 898 pr_err("transportshm_notify_fxn: argument passed is NULL!\n");
906 "NULL!\n");
907 return; 899 return;
908} 900}
909 901
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)
111 111
112exit: 112exit:
113 if (status < 0) 113 if (status < 0)
114 printk(KERN_ERR "transportshm_setup_attach failed! status " 114 pr_err("transportshm_setup_attach failed! status "
115 "= 0x%x", status); 115 "= 0x%x", status);
116 return status; 116 return status;
117} 117}
@@ -156,7 +156,7 @@ int transportshm_setup_detach(u16 remote_proc_id)
156 156
157exit: 157exit:
158 if (status < 0) 158 if (status < 0)
159 printk(KERN_ERR "transportshm_setup_detach failed! status " 159 pr_err("transportshm_setup_detach failed! status "
160 "= 0x%x", status); 160 "= 0x%x", status);
161 return status; 161 return status;
162} 162}
@@ -189,7 +189,7 @@ u32 transportshm_setup_shared_mem_req(u32 *shared_addr)
189 189
190exit: 190exit:
191 if (status < 0) 191 if (status < 0)
192 printk(KERN_ERR "transportshm_setup_shared_mem_req failed! " 192 pr_err("transportshm_setup_shared_mem_req failed! "
193 "status = 0x%x", status); 193 "status = 0x%x", status);
194 return mem_req; 194 return mem_req;
195} 195}
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)
180 180
181exit: 181exit:
182 if (status < 0) { 182 if (status < 0) {
183 printk(KERN_ERR "notify_ducatidrv_get_config failed! " 183 pr_err("notify_ducatidrv_get_config failed! "
184 "status = 0x%x", status); 184 "status = 0x%x", status);
185 } 185 }
186 return; 186 return;
@@ -231,7 +231,7 @@ int notify_ducatidrv_setup(struct notify_ducatidrv_config *cfg)
231 if (ducati_mbox == NULL) { 231 if (ducati_mbox == NULL) {
232 ducati_mbox = omap_mbox_get("mailbox-2", &ducati_notify_nb); 232 ducati_mbox = omap_mbox_get("mailbox-2", &ducati_notify_nb);
233 if (ducati_mbox == NULL) { 233 if (ducati_mbox == NULL) {
234 printk(KERN_ERR "Failed in omap_mbox_get(ducati)\n"); 234 pr_err("Failed in omap_mbox_get(ducati)\n");
235 status = NOTIFY_E_INVALIDSTATE; 235 status = NOTIFY_E_INVALIDSTATE;
236 goto error_mailbox_get_failed; 236 goto error_mailbox_get_failed;
237 } 237 }
@@ -241,7 +241,7 @@ int notify_ducatidrv_setup(struct notify_ducatidrv_config *cfg)
241 if (!tesla_mbox) { 241 if (!tesla_mbox) {
242 tesla_mbox = omap_mbox_get("mailbox-1", &ducati_notify_nb); 242 tesla_mbox = omap_mbox_get("mailbox-1", &ducati_notify_nb);
243 if (!tesla_mbox) { 243 if (!tesla_mbox) {
244 printk(KERN_ERR "Failed in omap_mbox_get(tesla)\n"); 244 pr_err("Failed in omap_mbox_get(tesla)\n");
245 status = NOTIFY_E_INVALIDSTATE; 245 status = NOTIFY_E_INVALIDSTATE;
246 goto error_mailbox_get_failed; 246 goto error_mailbox_get_failed;
247 } 247 }
@@ -253,7 +253,7 @@ error_mailbox_get_failed:
253error_exit: 253error_exit:
254 atomic_set(&(notify_ducatidriver_state.ref_count), 254 atomic_set(&(notify_ducatidriver_state.ref_count),
255 NOTIFYDUCATIDRIVER_MAKE_MAGICSTAMP(0)); 255 NOTIFYDUCATIDRIVER_MAKE_MAGICSTAMP(0));
256 printk(KERN_ERR "notify_ducatidrv_setup failed! status = 0x%x", status); 256 pr_err("notify_ducatidrv_setup failed! status = 0x%x", status);
257 return status; 257 return status;
258} 258}
259EXPORT_SYMBOL(notify_ducatidrv_setup); 259EXPORT_SYMBOL(notify_ducatidrv_setup);
@@ -307,7 +307,7 @@ int notify_ducatidrv_destroy(void)
307 307
308exit: 308exit:
309 if (status < 0) { 309 if (status < 0) {
310 printk(KERN_ERR "notify_ducatidrv_destroy failed! " 310 pr_err("notify_ducatidrv_destroy failed! "
311 "status = 0x%x", status); 311 "status = 0x%x", status);
312 } 312 }
313 return status; 313 return status;
@@ -337,7 +337,7 @@ void notify_ducatidrv_params_init(struct notify_ducatidrv_params *params)
337 337
338exit: 338exit:
339 if (status < 0) { 339 if (status < 0) {
340 printk(KERN_ERR "notify_ducatidrv_params_init failed! " 340 pr_err("notify_ducatidrv_params_init failed! "
341 "status = 0x%x", status); 341 "status = 0x%x", status);
342 } 342 }
343 return; 343 return;
@@ -567,8 +567,7 @@ error_unlock_and_return:
567 /* Leave critical section protection. */ 567 /* Leave critical section protection. */
568 mutex_unlock(notify_ducatidriver_state.gate_handle); 568 mutex_unlock(notify_ducatidriver_state.gate_handle);
569exit: 569exit:
570 printk(KERN_ERR "notify_ducatidrv_create failed! status = 0x%x", 570 pr_err("notify_ducatidrv_create failed! status = 0x%x", status);
571 status);
572 return NULL; 571 return NULL;
573} 572}
574EXPORT_SYMBOL(notify_ducatidrv_create); 573EXPORT_SYMBOL(notify_ducatidrv_create);
@@ -640,10 +639,8 @@ int notify_ducatidrv_delete(struct notify_ducatidrv_object **handle_ptr)
640 } 639 }
641 640
642exit: 641exit:
643 if (status < 0) { 642 if (status < 0)
644 printk(KERN_ERR "notify_ducatidrv_delete failed! " 643 pr_err("notify_ducatidrv_delete failed! status = 0x%x", status);
645 "status = 0x%x", status);
646 }
647 return status; 644 return status;
648} 645}
649EXPORT_SYMBOL(notify_ducatidrv_delete); 646EXPORT_SYMBOL(notify_ducatidrv_delete);
@@ -734,7 +731,7 @@ int notify_ducatidrv_register_event(struct notify_driver_object *handle,
734 731
735exit: 732exit:
736 if (status < 0) { 733 if (status < 0) {
737 printk(KERN_ERR "notify_ducatidrv_register_event failed! " 734 pr_err("notify_ducatidrv_register_event failed! "
738 "status = 0x%x", status); 735 "status = 0x%x", status);
739 } 736 }
740 return status; 737 return status;
@@ -825,7 +822,7 @@ int notify_ducatidrv_unregister_event(struct notify_driver_object *handle,
825 822
826exit: 823exit:
827 if (status < 0) { 824 if (status < 0) {
828 printk(KERN_ERR "notify_ducatidrv_unregister_event failed! " 825 pr_err("notify_ducatidrv_unregister_event failed! "
829 "status = 0x%x", status); 826 "status = 0x%x", status);
830 } 827 }
831 return status; 828 return status;
@@ -975,7 +972,7 @@ int notify_ducatidrv_send_event(struct notify_driver_object *handle,
975 972
976exit: 973exit:
977 if (status < 0) { 974 if (status < 0) {
978 printk(KERN_ERR "notify_ducatidrv_sendevent failed! " 975 pr_err("notify_ducatidrv_sendevent failed! "
979 "status = 0x%x", status); 976 "status = 0x%x", status);
980 } 977 }
981 return status; 978 return status;
@@ -1022,7 +1019,7 @@ int notify_ducatidrv_disable(struct notify_driver_object *handle)
1022 1019
1023exit: 1020exit:
1024 if (status < 0) { 1021 if (status < 0) {
1025 printk(KERN_ERR "notify_ducatidrv_disable failed! " 1022 pr_err("notify_ducatidrv_disable failed! "
1026 "status = 0x%x", status); 1023 "status = 0x%x", status);
1027 } 1024 }
1028 /*No flags to be returned. */ 1025 /*No flags to be returned. */
@@ -1071,7 +1068,7 @@ void notify_ducatidrv_enable(struct notify_driver_object *handle)
1071 1068
1072exit: 1069exit:
1073 if (status < 0) { 1070 if (status < 0) {
1074 printk(KERN_ERR "notify_ducatidrv_enable failed! " 1071 pr_err("notify_ducatidrv_enable failed! "
1075 "status = 0x%x", status); 1072 "status = 0x%x", status);
1076 } 1073 }
1077 return; 1074 return;
@@ -1178,7 +1175,7 @@ void notify_ducatidrv_disable_event(struct notify_driver_object *handle,
1178 1175
1179exit: 1176exit:
1180 if (status < 0) { 1177 if (status < 0) {
1181 printk(KERN_ERR "notify_ducatidrv_disable_event failed! " 1178 pr_err("notify_ducatidrv_disable_event failed! "
1182 "status = 0x%x", status); 1179 "status = 0x%x", status);
1183 } 1180 }
1184 return; 1181 return;
@@ -1236,7 +1233,7 @@ void notify_ducatidrv_enable_event(struct notify_driver_object *handle,
1236 1233
1237exit: 1234exit:
1238 if (status < 0) { 1235 if (status < 0) {
1239 printk(KERN_ERR "notify_ducatidrv_enable_event failed! " 1236 pr_err("notify_ducatidrv_enable_event failed! "
1240 "status = 0x%x", status); 1237 "status = 0x%x", status);
1241 } 1238 }
1242 return; 1239 return;
@@ -1286,7 +1283,7 @@ uint notify_ducatidrv_shared_mem_req(
1286 1283
1287exit: 1284exit:
1288 if (status < 0) { 1285 if (status < 0) {
1289 printk(KERN_ERR "notify_ducatidrv_shared_mem_req failed!" 1286 pr_err("notify_ducatidrv_shared_mem_req failed!"
1290 " status = 0x%x", status); 1287 " status = 0x%x", status);
1291 } 1288 }
1292 return mem_req; 1289 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,
570 u32 pid = *((u32 *)args); 570 u32 pid = *((u32 *)args);
571 status = notify_drv_attach(pid); 571 status = notify_drv_attach(pid);
572 if (status < 0) 572 if (status < 0)
573 printk(KERN_ERR "NOTIFY_ATTACH FAILED\n"); 573 pr_err("NOTIFY_ATTACH FAILED\n");
574 else { 574 else {
575 u32 *data = kmalloc(sizeof(u32), GFP_KERNEL); 575 u32 *data = kmalloc(sizeof(u32), GFP_KERNEL);
576 if (WARN_ON(!data)) { 576 if (WARN_ON(!data)) {
@@ -597,7 +597,7 @@ int notify_drv_ioctl(struct inode *inode, struct file *filp, u32 cmd,
597 else 597 else
598 status = notify_drv_detach(pid, true); 598 status = notify_drv_detach(pid, true);
599 if (status < 0) 599 if (status < 0)
600 printk(KERN_ERR "NOTIFY_DETACH FAILED\n"); 600 pr_err("NOTIFY_DETACH FAILED\n");
601 else 601 else
602 remove_pr_res(pr_ctxt, info); 602 remove_pr_res(pr_ctxt, info);
603 } 603 }
@@ -693,7 +693,7 @@ int notify_drv_ioctl(struct inode *inode, struct file *filp, u32 cmd,
693 /* This does not impact return status of this function,so retval 693 /* This does not impact return status of this function,so retval
694 * comment is not used. */ 694 * comment is not used. */
695 status = NOTIFY_E_INVALIDARG; 695 status = NOTIFY_E_INVALIDARG;
696 printk(KERN_ERR "not valid command\n"); 696 pr_err("not valid command\n");
697 } 697 }
698 break; 698 break;
699 } 699 }
@@ -735,10 +735,8 @@ static void _notify_drv_callback(u16 proc_id, u16 line_id, u32 event_id,
735 event_id, payload, cbck->func, cbck->param); 735 event_id, payload, cbck->func, cbck->param);
736 736
737func_end: 737func_end:
738 if (status < 0) { 738 if (status < 0)
739 printk(KERN_ERR "_notify_drv_callback failed! status = 0x%x", 739 pr_err("_notify_drv_callback failed! status = 0x%x", status);
740 status);
741 }
742 return; 740 return;
743} 741}
744 742
@@ -801,7 +799,7 @@ static int _notify_drv_add_buf_by_pid(u16 proc_id, u16 line_id, u32 pid,
801 799
802func_end: 800func_end:
803 if (status < 0) { 801 if (status < 0) {
804 printk(KERN_ERR "_notify_drv_add_buf_by_pid failed! " 802 pr_err("_notify_drv_add_buf_by_pid failed! "
805 "status = 0x%x", status); 803 "status = 0x%x", status);
806 } 804 }
807 return status; 805 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)
71 memcpy(cfg, &notify_state.cfg, sizeof(struct notify_config)); 71 memcpy(cfg, &notify_state.cfg, sizeof(struct notify_config));
72 72
73exit: 73exit:
74 if (retval < 0) { 74 if (retval < 0)
75 printk(KERN_ERR "notify_get_config failed! status = 0x%x", 75 pr_err("notify_get_config failed! status = 0x%x", retval);
76 retval);
77 }
78 return; 76 return;
79} 77}
80EXPORT_SYMBOL(notify_get_config); 78EXPORT_SYMBOL(notify_get_config);
@@ -140,7 +138,7 @@ local_notify_fail:
140 kfree(notify_state.gate_handle); 138 kfree(notify_state.gate_handle);
141exit: 139exit:
142 atomic_set(&notify_state.ref_count, NOTIFY_MAKE_MAGICSTAMP(0)); 140 atomic_set(&notify_state.ref_count, NOTIFY_MAKE_MAGICSTAMP(0));
143 printk(KERN_ERR "notify_setup failed! status = 0x%x", status); 141 pr_err("notify_setup failed! status = 0x%x", status);
144 return status; 142 return status;
145} 143}
146EXPORT_SYMBOL(notify_setup); 144EXPORT_SYMBOL(notify_setup);
@@ -179,7 +177,7 @@ int notify_destroy(void)
179 177
180exit: 178exit:
181 if (status < 0) 179 if (status < 0)
182 printk(KERN_ERR "notify_destroy failed! status = 0x%x", status); 180 pr_err("notify_destroy failed! status = 0x%x", status);
183 return status; 181 return status;
184} 182}
185EXPORT_SYMBOL(notify_destroy); 183EXPORT_SYMBOL(notify_destroy);
@@ -246,7 +244,7 @@ notify_handle_fail:
246 obj = NULL; 244 obj = NULL;
247exit: 245exit:
248 if (status < 0) 246 if (status < 0)
249 printk(KERN_ERR "notify_create failed! status = 0x%x", status); 247 pr_err("notify_create failed! status = 0x%x", status);
250 return obj; 248 return obj;
251} 249}
252 250
@@ -290,7 +288,7 @@ int notify_delete(struct notify_object **handle_ptr)
290 288
291exit: 289exit:
292 if (status < 0) 290 if (status < 0)
293 printk(KERN_ERR "notify_delete failed! status = 0x%x", status); 291 pr_err("notify_delete failed! status = 0x%x", status);
294 return status; 292 return status;
295} 293}
296 294
@@ -375,10 +373,8 @@ int notify_register_event(u16 proc_id, u16 line_id, u32 event_id,
375 } 373 }
376 374
377exit: 375exit:
378 if (status < 0) { 376 if (status < 0)
379 printk(KERN_ERR "notify_register_event failed! " 377 pr_err("notify_register_event failed! status = 0x%x", status);
380 "status = 0x%x", status);
381 }
382 return status; 378 return status;
383} 379}
384EXPORT_SYMBOL(notify_register_event); 380EXPORT_SYMBOL(notify_register_event);
@@ -452,7 +448,7 @@ int notify_register_event_single(u16 proc_id, u16 line_id, u32 event_id,
452 } 448 }
453exit: 449exit:
454 if (status < 0) { 450 if (status < 0) {
455 printk(KERN_ERR "notify_register_event_single failed! " 451 pr_err("notify_register_event_single failed! "
456 "status = 0x%x", status); 452 "status = 0x%x", status);
457 } 453 }
458 return status; 454 return status;
@@ -548,7 +544,7 @@ int notify_unregister_event(u16 proc_id, u16 line_id, u32 event_id,
548 kfree(listener); 544 kfree(listener);
549exit: 545exit:
550 if (status < 0) { 546 if (status < 0) {
551 printk(KERN_ERR "notify_unregister_event failed! " 547 pr_err("notify_unregister_event failed! "
552 "status = 0x%x", status); 548 "status = 0x%x", status);
553 } 549 }
554 return status; 550 return status;
@@ -618,7 +614,7 @@ int notify_unregister_event_single(u16 proc_id, u16 line_id, u32 event_id)
618 } 614 }
619exit: 615exit:
620 if (status < 0) { 616 if (status < 0) {
621 printk(KERN_ERR "notify_unregister_event_single failed! " 617 pr_err("notify_unregister_event_single failed! "
622 "status = 0x%x", status); 618 "status = 0x%x", status);
623 } 619 }
624 return status; 620 return status;
@@ -706,10 +702,8 @@ int notify_send_event(u16 proc_id, u16 line_id, u32 event_id, u32 payload,
706 } 702 }
707 } 703 }
708exit: 704exit:
709 if (status < 0) { 705 if (status < 0)
710 printk(KERN_ERR "notify_send_event failed! status = 0x%x", 706 pr_err("notify_send_event failed! status = 0x%x", status);
711 status);
712 }
713 return status; 707 return status;
714} 708}
715EXPORT_SYMBOL(notify_send_event); 709EXPORT_SYMBOL(notify_send_event);
@@ -768,7 +762,7 @@ u32 notify_disable(u16 proc_id, u16 line_id)
768 mutex_unlock(&obj->lock); 762 mutex_unlock(&obj->lock);
769exit: 763exit:
770 if (status < 0) 764 if (status < 0)
771 printk(KERN_ERR "notify_disable failed! status = 0x%x", status); 765 pr_err("notify_disable failed! status = 0x%x", status);
772 return key; 766 return key;
773} 767}
774EXPORT_SYMBOL(notify_disable); 768EXPORT_SYMBOL(notify_disable);
@@ -831,7 +825,7 @@ void notify_restore(u16 proc_id, u16 line_id, u32 key)
831 mutex_unlock(&obj->lock); 825 mutex_unlock(&obj->lock);
832exit: 826exit:
833 if (status < 0) 827 if (status < 0)
834 printk(KERN_ERR "notify_restore failed! status = 0x%x", status); 828 pr_err("notify_restore failed! status = 0x%x", status);
835 return; 829 return;
836} 830}
837EXPORT_SYMBOL(notify_restore); 831EXPORT_SYMBOL(notify_restore);
@@ -895,10 +889,8 @@ void notify_disable_event(u16 proc_id, u16 line_id, u32 event_id)
895 (unsigned long *) &notify_state.local_enable_mask); 889 (unsigned long *) &notify_state.local_enable_mask);
896 } 890 }
897exit: 891exit:
898 if (status < 0) { 892 if (status < 0)
899 printk(KERN_ERR "notify_disable_event failed! status = 0x%x", 893 pr_err("notify_disable_event failed! status = 0x%x", status);
900 status);
901 }
902 return; 894 return;
903} 895}
904EXPORT_SYMBOL(notify_disable_event); 896EXPORT_SYMBOL(notify_disable_event);
@@ -962,10 +954,8 @@ void notify_enable_event(u16 proc_id, u16 line_id, u32 event_id)
962 (unsigned long *)&notify_state.local_enable_mask); 954 (unsigned long *)&notify_state.local_enable_mask);
963 } 955 }
964exit: 956exit:
965 if (status < 0) { 957 if (status < 0)
966 printk(KERN_ERR "notify_enable_event failed! status = 0x%x", 958 pr_err("notify_enable_event failed! status = 0x%x", status);
967 status);
968 }
969 return; 959 return;
970} 960}
971EXPORT_SYMBOL(notify_enable_event); 961EXPORT_SYMBOL(notify_enable_event);
@@ -997,10 +987,8 @@ bool notify_is_registered(u16 proc_id, u16 line_id)
997 is_registered = true; 987 is_registered = true;
998 988
999exit: 989exit:
1000 if (status < 0) { 990 if (status < 0)
1001 printk(KERN_ERR "notify_is_registered failed! status = 0x%x", 991 pr_err("notify_is_registered failed! status = 0x%x", status);
1002 status);
1003 }
1004 return is_registered; 992 return is_registered;
1005} 993}
1006EXPORT_SYMBOL(notify_is_registered); 994EXPORT_SYMBOL(notify_is_registered);
@@ -1064,7 +1052,7 @@ void notify_exec(struct notify_object *obj, u32 event_id, u32 payload)
1064 WARN_ON(obj == NULL); 1052 WARN_ON(obj == NULL);
1065 if (WARN_ON((event_id >= notify_state.cfg.num_events) || 1053 if (WARN_ON((event_id >= notify_state.cfg.num_events) ||
1066 (event_id >= NOTIFY_MAXEVENTS))) { 1054 (event_id >= NOTIFY_MAXEVENTS))) {
1067 printk(KERN_ERR "Invalid event_id %d\n", event_id); 1055 pr_err("Invalid event_id %d\n", event_id);
1068 } else { 1056 } else {
1069 callback = &(obj->callbacks[event_id]); 1057 callback = &(obj->callbacks[event_id]);
1070 WARN_ON(callback->fn_notify_cbck == NULL); 1058 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,
178 178
179exit: 179exit:
180 if (status < 0) { 180 if (status < 0) {
181 printk(KERN_ERR "notify_get_driver_handle failed! " 181 pr_err("notify_get_driver_handle failed! "
182 "status = 0x%x\n", status); 182 "status = 0x%x\n", status);
183 } 183 }
184 return handle; 184 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)
73 &notify_shm_params); 73 &notify_shm_params);
74 if (notify_setup_driver_handles[proc_id] == NULL) { 74 if (notify_setup_driver_handles[proc_id] == NULL) {
75 status = NOTIFY_E_FAIL; 75 status = NOTIFY_E_FAIL;
76 printk(KERN_ERR "notify_setup_omap4_attach: " 76 pr_err("notify_setup_omap4_attach: "
77 "notify_ducatidrv_create failed! status = 0x%x", 77 "notify_ducatidrv_create failed! status = 0x%x",
78 status); 78 status);
79 goto exit; 79 goto exit;
@@ -84,14 +84,14 @@ int notify_setup_omap4_attach(u16 proc_id, void *shared_addr)
84 proc_id, 0u, NULL); 84 proc_id, 0u, NULL);
85 if (notify_setup_notify_handles[proc_id] == NULL) { 85 if (notify_setup_notify_handles[proc_id] == NULL) {
86 status = NOTIFY_E_FAIL; 86 status = NOTIFY_E_FAIL;
87 printk(KERN_ERR "notify_setup_omap4_attach: notify_create " 87 pr_err("notify_setup_omap4_attach: notify_create "
88 "failed!"); 88 "failed!");
89 goto exit; 89 goto exit;
90 } 90 }
91 91
92exit: 92exit:
93 if (status < 0) { 93 if (status < 0) {
94 printk(KERN_ERR "notify_setup_omap4_attach failed! " 94 pr_err("notify_setup_omap4_attach failed! "
95 "status = 0x%x", status); 95 "status = 0x%x", status);
96 } 96 }
97 return status; 97 return status;
@@ -113,7 +113,7 @@ int notify_setup_omap4_detach(u16 proc_id)
113 /* Delete the notify driver to the M3 (Line 0) */ 113 /* Delete the notify driver to the M3 (Line 0) */
114 status = notify_delete(&(notify_setup_notify_handles[proc_id])); 114 status = notify_delete(&(notify_setup_notify_handles[proc_id]));
115 if (status < 0) { 115 if (status < 0) {
116 printk(KERN_ERR "notify_setup_omap4_detach: notify_delete " 116 pr_err("notify_setup_omap4_detach: notify_delete "
117 "failed for line 0!"); 117 "failed for line 0!");
118 } 118 }
119 119
@@ -121,13 +121,13 @@ int notify_setup_omap4_detach(u16 proc_id)
121 &(notify_setup_driver_handles[proc_id])); 121 &(notify_setup_driver_handles[proc_id]));
122 if ((tmp_status < 0) && (status >= 0)) { 122 if ((tmp_status < 0) && (status >= 0)) {
123 status = tmp_status; 123 status = tmp_status;
124 printk(KERN_ERR "notify_setup_omap4_detach: " 124 pr_err("notify_setup_omap4_detach: "
125 "notify_ducatidrv_delete failed for line 0!"); 125 "notify_ducatidrv_delete failed for line 0!");
126 } 126 }
127 127
128exit: 128exit:
129 if (status < 0) { 129 if (status < 0) {
130 printk(KERN_ERR "notify_setup_omap4_detach failed! " 130 pr_err("notify_setup_omap4_detach failed! "
131 "status = 0x%x", status); 131 "status = 0x%x", status);
132 } 132 }
133 return status; 133 return status;
@@ -153,7 +153,7 @@ uint notify_setup_omap4_shared_mem_req(u16 remote_proc_id, void *shared_addr)
153 153
154exit: 154exit:
155 if (status < 0) { 155 if (status < 0) {
156 printk(KERN_ERR "notify_setup_omap4_shared_mem_req failed!" 156 pr_err("notify_setup_omap4_shared_mem_req failed!"
157 " status = 0x%x", status); 157 " status = 0x%x", status);
158 } 158 }
159 return mem_req; 159 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)
231 OMAP4430PROC_MAKE_MAGICSTAMP(0), 231 OMAP4430PROC_MAKE_MAGICSTAMP(0),
232 OMAP4430PROC_MAKE_MAGICSTAMP(1)) 232 OMAP4430PROC_MAKE_MAGICSTAMP(1))
233 == true) { 233 == true) {
234 printk(KERN_ERR "proc4430_params_init failed " 234 pr_err("proc4430_params_init failed - Module not initialized");
235 "Module not initialized");
236 return; 235 return;
237 } 236 }
238 237
239 if (WARN_ON(params == NULL)) { 238 if (WARN_ON(params == NULL)) {
240 printk(KERN_ERR "proc4430_params_init failed " 239 pr_err("proc4430_params_init failed "
241 "Argument of type proc4430_params * " 240 "Argument of type proc4430_params * "
242 "is NULL"); 241 "is NULL");
243 return; 242 return;
@@ -268,8 +267,7 @@ void *proc4430_create(u16 proc_id, const struct proc4430_params *params)
268 OMAP4430PROC_MAKE_MAGICSTAMP(0), 267 OMAP4430PROC_MAKE_MAGICSTAMP(0),
269 OMAP4430PROC_MAKE_MAGICSTAMP(1)) 268 OMAP4430PROC_MAKE_MAGICSTAMP(1))
270 == true) { 269 == true) {
271 printk(KERN_ERR "proc4430_create failed " 270 pr_err("proc4430_create failed - Module not initialized");
272 "Module not initialized");
273 goto error; 271 goto error;
274 } 272 }
275 273
@@ -345,8 +343,7 @@ int proc4430_delete(void **handle_ptr)
345 OMAP4430PROC_MAKE_MAGICSTAMP(0), 343 OMAP4430PROC_MAKE_MAGICSTAMP(0),
346 OMAP4430PROC_MAKE_MAGICSTAMP(1)) 344 OMAP4430PROC_MAKE_MAGICSTAMP(1))
347 == true) { 345 == true) {
348 printk(KERN_ERR "proc4430_delete failed " 346 pr_err("proc4430_delete failed Module not initialized");
349 "Module not initialized");
350 return -ENODEV; 347 return -ENODEV;
351 } 348 }
352 349
@@ -391,8 +388,7 @@ int proc4430_open(void **handle_ptr, u16 proc_id)
391 OMAP4430PROC_MAKE_MAGICSTAMP(0), 388 OMAP4430PROC_MAKE_MAGICSTAMP(0),
392 OMAP4430PROC_MAKE_MAGICSTAMP(1)) 389 OMAP4430PROC_MAKE_MAGICSTAMP(1))
393 == true) { 390 == true) {
394 printk(KERN_ERR "proc4430_open failed " 391 pr_err("proc4430_open failed Module not initialized");
395 "Module not initialized");
396 return -ENODEV; 392 return -ENODEV;
397 } 393 }
398 394
@@ -424,8 +420,7 @@ int proc4430_close(void *handle)
424 OMAP4430PROC_MAKE_MAGICSTAMP(0), 420 OMAP4430PROC_MAKE_MAGICSTAMP(0),
425 OMAP4430PROC_MAKE_MAGICSTAMP(1)) 421 OMAP4430PROC_MAKE_MAGICSTAMP(1))
426 == true) { 422 == true) {
427 printk(KERN_ERR "proc4430_close failed " 423 pr_err("proc4430_close failed Module not initialized");
428 "Module not initialized");
429 return -ENODEV; 424 return -ENODEV;
430 } 425 }
431 426
@@ -456,19 +451,17 @@ int proc4430_attach(void *handle, struct processor_attach_params *params)
456 OMAP4430PROC_MAKE_MAGICSTAMP(0), 451 OMAP4430PROC_MAKE_MAGICSTAMP(0),
457 OMAP4430PROC_MAKE_MAGICSTAMP(1)) 452 OMAP4430PROC_MAKE_MAGICSTAMP(1))
458 == true) { 453 == true) {
459 printk(KERN_ERR "proc4430_attach failed" 454 pr_err("proc4430_attach failed Module not initialized");
460 "Module not initialized");
461 return -ENODEV; 455 return -ENODEV;
462 } 456 }
463 457
464 if (WARN_ON(handle == NULL)) { 458 if (WARN_ON(handle == NULL)) {
465 printk(KERN_ERR "proc4430_attach failed" 459 pr_err("proc4430_attach failed Driver handle is NULL");
466 "Driver handle is NULL");
467 return -EINVAL; 460 return -EINVAL;
468 } 461 }
469 462
470 if (WARN_ON(params == NULL)) { 463 if (WARN_ON(params == NULL)) {
471 printk(KERN_ERR "proc4430_attach failed" 464 pr_err("proc4430_attach failed"
472 "Argument processor_attach_params * is NULL"); 465 "Argument processor_attach_params * is NULL");
473 return -EINVAL; 466 return -EINVAL;
474 } 467 }
@@ -482,7 +475,7 @@ int proc4430_attach(void *handle, struct processor_attach_params *params)
482 OMAP4430PROC_MAKE_MAGICSTAMP(0)); 475 OMAP4430PROC_MAKE_MAGICSTAMP(0));
483 atomic_inc_return(&object->attach_count); 476 atomic_inc_return(&object->attach_count);
484 477
485 printk(KERN_ERR "proc4430_attach num_mem_entries = %d", 478 pr_err("proc4430_attach num_mem_entries = %d",
486 object->params.num_mem_entries); 479 object->params.num_mem_entries);
487 /* Return memory information in params. */ 480 /* Return memory information in params. */
488 for (i = 0; (i < object->params.num_mem_entries); i++) { 481 for (i = 0; (i < object->params.num_mem_entries); i++) {
@@ -497,7 +490,7 @@ int proc4430_attach(void *handle, struct processor_attach_params *params)
497 map_info.is_cached = false; 490 map_info.is_cached = false;
498 retval = platform_mem_map(&map_info); 491 retval = platform_mem_map(&map_info);
499 if (retval != 0) { 492 if (retval != 0) {
500 printk(KERN_ERR "proc4430_attach failed\n"); 493 pr_err("proc4430_attach failed\n");
501 return -EFAULT; 494 return -EFAULT;
502 } 495 }
503 map_count++; 496 map_count++;
@@ -540,12 +533,11 @@ int proc4430_detach(void *handle)
540 OMAP4430PROC_MAKE_MAGICSTAMP(1)) 533 OMAP4430PROC_MAKE_MAGICSTAMP(1))
541 == true) { 534 == true) {
542 535
543 printk(KERN_ERR "proc4430_detach failed " 536 pr_err("proc4430_detach failed Module not initialized");
544 "Module not initialized");
545 return -ENODEV; 537 return -ENODEV;
546 } 538 }
547 if (WARN_ON(handle == NULL)) { 539 if (WARN_ON(handle == NULL)) {
548 printk(KERN_ERR "proc4430_detach failed " 540 pr_err("proc4430_detach failed "
549 "Argument Driverhandle is NULL"); 541 "Argument Driverhandle is NULL");
550 return -EINVAL; 542 return -EINVAL;
551 } 543 }
@@ -586,8 +578,7 @@ int proc4430_read(void *handle, u32 proc_addr, u32 *num_bytes,
586 OMAP4430PROC_MAKE_MAGICSTAMP(0), 578 OMAP4430PROC_MAKE_MAGICSTAMP(0),
587 OMAP4430PROC_MAKE_MAGICSTAMP(1)) 579 OMAP4430PROC_MAKE_MAGICSTAMP(1))
588 == true) { 580 == true) {
589 printk(KERN_ERR "proc4430_read failed " 581 pr_err("proc4430_read failed Module not initialized");
590 "Module not initialized");
591 return -ENODEV; 582 return -ENODEV;
592 } 583 }
593 584
@@ -613,8 +604,7 @@ int proc4430_write(void *handle, u32 proc_addr, u32 *num_bytes,
613 OMAP4430PROC_MAKE_MAGICSTAMP(0), 604 OMAP4430PROC_MAKE_MAGICSTAMP(0),
614 OMAP4430PROC_MAKE_MAGICSTAMP(1)) 605 OMAP4430PROC_MAKE_MAGICSTAMP(1))
615 == true) { 606 == true) {
616 printk(KERN_ERR "proc4430_write failed " 607 pr_err("proc4430_write failed Module not initialized");
617 "Module not initialized");
618 return -ENODEV; 608 return -ENODEV;
619 } 609 }
620 610
@@ -644,18 +634,17 @@ int proc4430_control(void *handle, int cmd, void *arg)
644 retval = ipu_pm_notifications(cmd, NULL); 634 retval = ipu_pm_notifications(cmd, NULL);
645 break; 635 break;
646 default: 636 default:
647 printk(KERN_ERR "Invalid notification\n"); 637 pr_err("Invalid notification\n");
648 } 638 }
649 if (retval != PM_SUCCESS) 639 if (retval != PM_SUCCESS)
650 printk(KERN_ERR "Error in notifications\n"); 640 pr_err("Error in notifications\n");
651#endif 641#endif
652 642
653 if (atomic_cmpmask_and_lt(&proc4430_state.ref_count, 643 if (atomic_cmpmask_and_lt(&proc4430_state.ref_count,
654 OMAP4430PROC_MAKE_MAGICSTAMP(0), 644 OMAP4430PROC_MAKE_MAGICSTAMP(0),
655 OMAP4430PROC_MAKE_MAGICSTAMP(1)) 645 OMAP4430PROC_MAKE_MAGICSTAMP(1))
656 == true) { 646 == true) {
657 printk(KERN_ERR "proc4430_control failed " 647 pr_err("proc4430_control failed Module not initialized");
658 "Module not initialized");
659 return -ENODEV; 648 return -ENODEV;
660 } 649 }
661 650
@@ -685,8 +674,7 @@ int proc4430_translate_addr(void *handle,
685 OMAP4430PROC_MAKE_MAGICSTAMP(0), 674 OMAP4430PROC_MAKE_MAGICSTAMP(0),
686 OMAP4430PROC_MAKE_MAGICSTAMP(1)) 675 OMAP4430PROC_MAKE_MAGICSTAMP(1))
687 == true) { 676 == true) {
688 printk(KERN_ERR "proc4430_translate_addr failed " 677 pr_err("proc4430_translate_addr failed Module not initialized");
689 "Module not initialized");
690 retval = -ENODEV; 678 retval = -ENODEV;
691 goto error_exit; 679 goto error_exit;
692 } 680 }
@@ -764,8 +752,7 @@ int proc4430_virt_to_phys(void *handle, u32 da, u32 *mapped_entries,
764 OMAP4430PROC_MAKE_MAGICSTAMP(0), 752 OMAP4430PROC_MAKE_MAGICSTAMP(0),
765 OMAP4430PROC_MAKE_MAGICSTAMP(1)) 753 OMAP4430PROC_MAKE_MAGICSTAMP(1))
766 == true) { 754 == true) {
767 printk(KERN_ERR "proc4430_virt_to_phys failed " 755 pr_err("proc4430_virt_to_phys failed Module not initialized");
768 "Module not initialized");
769 ret_val = -EFAULT; 756 ret_val = -EFAULT;
770 goto error_exit; 757 goto error_exit;
771 } 758 }
@@ -782,7 +769,7 @@ int proc4430_virt_to_phys(void *handle, u32 da, u32 *mapped_entries,
782 return 0; 769 return 0;
783 770
784error_exit: 771error_exit:
785 printk(KERN_WARNING "proc4430_virtToPhys failed !!!!\n"); 772 pr_warn("proc4430_virtToPhys failed !!!!\n");
786 return ret_val; 773 return ret_val;
787} 774}
788 775
@@ -802,8 +789,7 @@ int proc4430_proc_info(void *handle, struct proc_mgr_proc_info *procinfo)
802 OMAP4430PROC_MAKE_MAGICSTAMP(0), 789 OMAP4430PROC_MAKE_MAGICSTAMP(0),
803 OMAP4430PROC_MAKE_MAGICSTAMP(1)) 790 OMAP4430PROC_MAKE_MAGICSTAMP(1))
804 == true) { 791 == true) {
805 printk(KERN_ERR "proc4430_proc_info failed " 792 pr_err("proc4430_proc_info failed Module not initialized");
806 "Module not initialized");
807 goto error_exit; 793 goto error_exit;
808 } 794 }
809 795
@@ -829,6 +815,6 @@ int proc4430_proc_info(void *handle, struct proc_mgr_proc_info *procinfo)
829 return 0; 815 return 0;
830 816
831error_exit: 817error_exit:
832 printk(KERN_WARNING "proc4430_proc_info failed !!!!\n"); 818 pr_warn("proc4430_proc_info failed !!!!\n");
833 return -EFAULT; 819 return -EFAULT;
834} 820}
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,
311 311
312 default: 312 default:
313 { 313 {
314 printk(KERN_ERR "unsupported ioctl\n"); 314 pr_err("unsupported ioctl\n");
315 } 315 }
316 break; 316 break;
317 } 317 }
@@ -358,7 +358,7 @@ static int __init proc4430_drv_initializeModule(void)
358 int retval; 358 int retval;
359 359
360 /* Display the version info and created date/time */ 360 /* Display the version info and created date/time */
361 printk(KERN_INFO "proc4430_drv_initializeModule\n"); 361 pr_info("proc4430_drv_initializeModule\n");
362 362
363 if (driver_major) { 363 if (driver_major) {
364 dev = MKDEV(driver_major, driver_minor); 364 dev = MKDEV(driver_major, driver_minor);
@@ -383,7 +383,7 @@ static int __init proc4430_drv_initializeModule(void)
383 retval = cdev_add(&proc_4430_device->cdev, dev, 1); 383 retval = cdev_add(&proc_4430_device->cdev, dev, 1);
384 384
385 if (retval) { 385 if (retval) {
386 printk(KERN_ERR "Failed to add the syslink proc_4430 device\n"); 386 pr_err("Failed to add the syslink proc_4430 device\n");
387 goto exit; 387 goto exit;
388 } 388 }
389 389
@@ -391,7 +391,7 @@ static int __init proc4430_drv_initializeModule(void)
391 proc_4430_class = class_create(THIS_MODULE, "syslink-proc4430"); 391 proc_4430_class = class_create(THIS_MODULE, "syslink-proc4430");
392 392
393 if (IS_ERR(proc_4430_class)) { 393 if (IS_ERR(proc_4430_class)) {
394 printk(KERN_ERR "Error creating bridge class\n"); 394 pr_err("Error creating bridge class\n");
395 goto exit; 395 goto exit;
396 } 396 }
397 device_create(proc_4430_class, NULL, MKDEV(driver_major, driver_minor), 397 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)
172 if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count), 172 if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count),
173 PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1)) 173 PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1))
174 == true) { 174 == true) {
175 printk(KERN_ERR "proc_mgr_destroy: Error - module not initialized\n"); 175 pr_err("proc_mgr_destroy: Error - module not initialized\n");
176 return -EFAULT; 176 return -EFAULT;
177 } 177 }
178 if (atomic_dec_return(&proc_mgr_obj_state.ref_count) 178 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)
213 if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count), 213 if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count),
214 PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1)) 214 PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1))
215 == true) { 215 == true) {
216 printk(KERN_ERR "proc_mgr_params_init: Error - module not initialized\n"); 216 pr_err("proc_mgr_params_init: Error - module not initialized\n");
217 } 217 }
218 if (handle == NULL) { 218 if (handle == NULL) {
219 memcpy(params, &(proc_mgr_obj_state.def_inst_params), 219 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)
256 if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count), 256 if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count),
257 PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1)) 257 PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1))
258 == true) { 258 == true) {
259 printk(KERN_ERR "proc_mgr_create: Error - module not initialized\n"); 259 pr_err("proc_mgr_create: Error - module not initialized\n");
260 return NULL; 260 return NULL;
261 } 261 }
262 if (proc_mgr_obj_state.proc_handles[proc_id] != NULL) { 262 if (proc_mgr_obj_state.proc_handles[proc_id] != NULL) {
263 handle = proc_mgr_obj_state.proc_handles[proc_id]; 263 handle = proc_mgr_obj_state.proc_handles[proc_id];
264 printk(KERN_WARNING "proc_mgr_create:" 264 pr_warn("proc_mgr_create:"
265 "Processor already exists for specified" 265 "Processor already exists for specified"
266 "%d proc_id, handle = 0x%x\n", proc_id, (u32)handle); 266 "%d proc_id, handle = 0x%x\n", proc_id, (u32)handle);
267 return handle; 267 return handle;
@@ -300,7 +300,7 @@ proc_mgr_delete(void **handle_ptr)
300 if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count), 300 if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count),
301 PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1)) 301 PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1))
302 == true) { 302 == true) {
303 printk(KERN_ERR "proc_mgr_delete: Error - module not initialized\n"); 303 pr_err("proc_mgr_delete: Error - module not initialized\n");
304 return -EFAULT; 304 return -EFAULT;
305 } 305 }
306 306
@@ -331,7 +331,7 @@ int proc_mgr_open(void **handle_ptr, u16 proc_id)
331 if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count), 331 if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count),
332 PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1)) 332 PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1))
333 == true) { 333 == true) {
334 printk(KERN_ERR "proc_mgr_open: Error - module not initialized\n"); 334 pr_err("proc_mgr_open: Error - module not initialized\n");
335 return -EFAULT; 335 return -EFAULT;
336 } 336 }
337 337
@@ -356,7 +356,7 @@ int proc_mgr_close(void *handle)
356 if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count), 356 if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count),
357 PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1)) 357 PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1))
358 == true) { 358 == true) {
359 printk(KERN_ERR "proc_mgr_close: Error - module not initialized\n"); 359 pr_err("proc_mgr_close: Error - module not initialized\n");
360 return -EFAULT; 360 return -EFAULT;
361 } 361 }
362 /* Nothing to be done for closing the handle. */ 362 /* Nothing to be done for closing the handle. */
@@ -383,7 +383,7 @@ void proc_mgr_get_attach_params(void *handle,
383 if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count), 383 if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count),
384 PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1)) 384 PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1))
385 == true) { 385 == true) {
386 printk(KERN_ERR "proc_mgr_get_attach_params:" 386 pr_err("proc_mgr_get_attach_params:"
387 "Error - module not initialized\n"); 387 "Error - module not initialized\n");
388 } 388 }
389 if (handle == NULL) { 389 if (handle == NULL) {
@@ -435,8 +435,7 @@ int proc_mgr_attach(void *handle, struct proc_mgr_attach_params *params)
435 if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count), 435 if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count),
436 PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1)) 436 PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1))
437 == true) { 437 == true) {
438 printk(KERN_ERR "proc_mgr_attach:" 438 pr_err("proc_mgr_attach: Error - module not initialized\n");
439 "Error - module not initialized\n");
440 return -EFAULT; 439 return -EFAULT;
441 } 440 }
442 if (WARN_ON(handle == NULL)) { 441 if (WARN_ON(handle == NULL)) {
@@ -457,7 +456,7 @@ int proc_mgr_attach(void *handle, struct proc_mgr_attach_params *params)
457 retval = processor_attach(proc_mgr_handle->proc_handle, 456 retval = processor_attach(proc_mgr_handle->proc_handle,
458 &proc_attach_params); 457 &proc_attach_params);
459 proc_mgr_handle->num_mem_entries = proc_attach_params.num_mem_entries; 458 proc_mgr_handle->num_mem_entries = proc_attach_params.num_mem_entries;
460 printk(KERN_INFO "proc_mgr_attach:proc_mgr_handle->num_mem_entries = %d\n", 459 pr_info("proc_mgr_attach:proc_mgr_handle->num_mem_entries = %d\n",
461 proc_mgr_handle->num_mem_entries); 460 proc_mgr_handle->num_mem_entries);
462 /* Store memory information in local object.*/ 461 /* Store memory information in local object.*/
463 memcpy(&(proc_mgr_handle->mem_entries), 462 memcpy(&(proc_mgr_handle->mem_entries),
@@ -490,8 +489,7 @@ int proc_mgr_detach(void *handle)
490 if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count), 489 if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count),
491 PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1)) 490 PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1))
492 == true) { 491 == true) {
493 printk(KERN_ERR "proc_mgr_detach:" 492 pr_err("proc_mgr_detach: Error - module not initialized\n");
494 "Error - module not initialized\n");
495 return -EFAULT; 493 return -EFAULT;
496 } 494 }
497 BUG_ON(handle == NULL); 495 BUG_ON(handle == NULL);
@@ -520,8 +518,7 @@ enum proc_mgr_state proc_mgr_get_state(void *handle)
520 if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count), 518 if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count),
521 PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1)) 519 PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1))
522 == true) { 520 == true) {
523 printk(KERN_ERR "proc_mgr_get_state:" 521 pr_err("proc_mgr_get_state: Error - module not initialized\n");
524 "Error - module not initialized\n");
525 return -EFAULT; 522 return -EFAULT;
526 } 523 }
527 BUG_ON(handle == NULL); 524 BUG_ON(handle == NULL);
@@ -552,8 +549,7 @@ int proc_mgr_read(void *handle, u32 proc_addr, u32 *num_bytes, void *buffer)
552 if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count), 549 if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count),
553 PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1)) 550 PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1))
554 == true) { 551 == true) {
555 printk(KERN_ERR "proc_mgr_read:" 552 pr_err("proc_mgr_read: Error - module not initialized\n");
556 "Error - module not initialized\n");
557 return -EFAULT; 553 return -EFAULT;
558 } 554 }
559 BUG_ON(handle == NULL); 555 BUG_ON(handle == NULL);
@@ -603,8 +599,7 @@ int proc_mgr_write(void *handle, u32 proc_addr, u32 *num_bytes, void *buffer)
603 if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count), 599 if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count),
604 PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1)) 600 PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1))
605 == true) { 601 == true) {
606 printk(KERN_ERR "proc_mgr_write:" 602 pr_err("proc_mgr_write: Error - module not initialized\n");
607 "Error - module not initialized\n");
608 return -EFAULT; 603 return -EFAULT;
609 } 604 }
610 BUG_ON(proc_addr == 0); 605 BUG_ON(proc_addr == 0);
@@ -637,8 +632,7 @@ int proc_mgr_control(void *handle, int cmd, void *arg)
637 if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count), 632 if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count),
638 PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1)) 633 PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1))
639 == true) { 634 == true) {
640 printk(KERN_ERR "proc_mgr_control:" 635 pr_err("proc_mgr_control: Error - module not initialized\n");
641 "Error - module not initialized\n");
642 return -EFAULT; 636 return -EFAULT;
643 } 637 }
644 BUG_ON(handle == NULL); 638 BUG_ON(handle == NULL);
@@ -669,7 +663,7 @@ int proc_mgr_translate_addr(void *handle, void **dst_addr,
669 if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count), 663 if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count),
670 PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1)) 664 PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1))
671 == true) { 665 == true) {
672 printk(KERN_ERR "proc_mgr_translate_addr:" 666 pr_err("proc_mgr_translate_addr:"
673 "Error - module not initialized\n"); 667 "Error - module not initialized\n");
674 return -EFAULT; 668 return -EFAULT;
675 } 669 }
@@ -706,7 +700,7 @@ int proc_mgr_register_notify(void *handle, proc_mgr_callback_fxn fxn,
706 if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count), 700 if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count),
707 PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1)) 701 PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1))
708 == true) { 702 == true) {
709 printk(KERN_ERR "proc_mgr_register_notify:" 703 pr_err("proc_mgr_register_notify:"
710 "Error - module not initialized\n"); 704 "Error - module not initialized\n");
711 return -EFAULT; 705 return -EFAULT;
712 } 706 }
@@ -736,7 +730,7 @@ int proc_mgr_get_proc_info(void *handle, struct proc_mgr_proc_info *proc_info)
736 if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count), 730 if (atomic_cmpmask_and_lt(&(proc_mgr_obj_state.ref_count),
737 PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1)) 731 PROCMGR_MAKE_MAGICSTAMP(0), PROCMGR_MAKE_MAGICSTAMP(1))
738 == true) { 732 == true) {
739 printk(KERN_ERR "proc_mgr_get_proc_info:" 733 pr_err("proc_mgr_get_proc_info:"
740 "Error - module not initialized\n"); 734 "Error - module not initialized\n");
741 return -EFAULT; 735 return -EFAULT;
742 } 736 }
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)
145 pr_ctxt = filp->private_data; 145 pr_ctxt = filp->private_data;
146 while (pr_ctxt->setup_count-- > 0) { 146 while (pr_ctxt->setup_count-- > 0) {
147 /* Destroy has not been called. Call destroy now. */ 147 /* Destroy has not been called. Call destroy now. */
148 printk(KERN_ERR "proc_mgr_drv_release: " 148 pr_err("proc_mgr_drv_release: "
149 "proc_mgr_destroy %d\n", pr_ctxt->setup_count); 149 "proc_mgr_destroy %d\n", pr_ctxt->setup_count);
150 proc_mgr_destroy(); 150 proc_mgr_destroy();
151 } 151 }
@@ -577,7 +577,7 @@ static int proc_mgr_drv_ioctl(struct inode *inode, struct file *filp,
577 } 577 }
578 break; 578 break;
579 default: 579 default:
580 printk(KERN_ERR"PROC_MGR_DRV: WRONG IOCTL !!!!\n"); 580 pr_err("PROC_MGR_DRV: WRONG IOCTL !!!!\n");
581 BUG_ON(1); 581 BUG_ON(1);
582 break; 582 break;
583 } 583 }
@@ -641,7 +641,7 @@ static int __devinit proc_mgr_probe(struct platform_device *pdev)
641 retval = cdev_add(&procmgr_device->cdev, dev, 1); 641 retval = cdev_add(&procmgr_device->cdev, dev, 1);
642 642
643 if (retval) { 643 if (retval) {
644 printk(KERN_ERR "Failed to add the syslink procmgr device\n"); 644 pr_err("Failed to add the syslink procmgr device\n");
645 goto exit; 645 goto exit;
646 } 646 }
647 647
@@ -649,7 +649,7 @@ static int __devinit proc_mgr_probe(struct platform_device *pdev)
649 proc_mgr_class = class_create(THIS_MODULE, "syslink-procmgr"); 649 proc_mgr_class = class_create(THIS_MODULE, "syslink-procmgr");
650 650
651 if (IS_ERR(proc_mgr_class)) { 651 if (IS_ERR(proc_mgr_class)) {
652 printk(KERN_ERR "Error creating bridge class\n"); 652 pr_err("Error creating bridge class\n");
653 goto exit; 653 goto exit;
654 } 654 }
655 device_create(proc_mgr_class, NULL, MKDEV(driver_major, driver_minor), 655 device_create(proc_mgr_class, NULL, MKDEV(driver_major, driver_minor),
@@ -691,7 +691,7 @@ static int __init proc_mgr_drv_initialize_module(void)
691 691
692 procmgr_pdev = platform_device_alloc(PROCMGR_NAME, -1); 692 procmgr_pdev = platform_device_alloc(PROCMGR_NAME, -1);
693 if (!procmgr_pdev) { 693 if (!procmgr_pdev) {
694 printk(KERN_ERR "%s:device allocation failed\n", __func__); 694 pr_err("%s:device allocation failed\n", __func__);
695 return -ENOMEM; 695 return -ENOMEM;
696 } 696 }
697 retval = platform_device_add(procmgr_pdev); 697 retval = platform_device_add(procmgr_pdev);
generated by cgit v1.2.2 (git 2.25.0) at 2025-09-01 11:31:36 -0400