Skip to content

Commit 431e4a9

Browse files
Hari KanigeriLuis Henriques
Hari Kanigeri
authored and
Luis Henriques
committed
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 <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]>
1 parent 128f23a commit 431e4a9

30 files changed

+578
-751
lines changed

‎drivers/dsp/syslink/multicore_ipc/gatehwspinlock.c

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ int gatehwspinlock_setup(const struct gatehwspinlock_config *config)
183183
lock_handle = hwspinlock_request_specific(i);
184184
if (lock_handle == NULL) {
185185
retval = -EBUSY;
186-
printk(KERN_ERR "hwspinlock_request failed for"
186+
pr_err("hwspinlock_request failed for"
187187
"id = %d", i);
188188
goto spinlock_request_fail;
189189
}
@@ -200,8 +200,7 @@ int gatehwspinlock_setup(const struct gatehwspinlock_config *config)
200200
kfree(gatehwspinlock_module->hw_lock_handles);
201201
atomic_dec_return(&gatehwspinlock_module->ref_count);
202202
if (retval < 0)
203-
printk(KERN_ERR "gatehwspinlock_setup failed! status = 0x%x",
204-
retval);
203+
pr_err("gatehwspinlock_setup failed! status = 0x%x", retval);
205204
return retval;
206205
}
207206
EXPORT_SYMBOL(gatehwspinlock_setup);
@@ -240,8 +239,7 @@ int gatehwspinlock_destroy(void)
240239
lock_handle = gatehwspinlock_module->hw_lock_handles[i];
241240
retval = hwspinlock_free(lock_handle);
242241
if (retval < 0)
243-
printk(KERN_ERR "hwspinlock_free failed for"
244-
"id = %d", i);
242+
pr_err("hwspinlock_free failed for id = %d", i);
245243
gatehwspinlock_module->hw_lock_handles[i] = NULL;
246244
}
247245
memset(&gatehwspinlock_module->cfg, 0,
@@ -251,12 +249,9 @@ int gatehwspinlock_destroy(void)
251249
return 0;
252250

253251
exit:
254-
if (retval < 0) {
255-
printk(KERN_ERR "gatehwspinlock_destroy failed status:%x\n",
256-
retval);
257-
}
252+
if (retval < 0)
253+
pr_err("gatehwspinlock_destroy failed status:%x\n", retval);
258254
return retval;
259-
260255
}
261256
EXPORT_SYMBOL(gatehwspinlock_destroy);
262257

@@ -375,7 +370,7 @@ void *gatehwspinlock_create(enum igatempsupport_local_protect local_protect,
375370
gatehwspinlock_module->hw_lock_handles[params->resource_id];
376371
if (obj->hwhandle == NULL) {
377372
retval = -EBUSY;
378-
printk(KERN_ERR "hwspinlock_request failed for id = %d",
373+
pr_err("hwspinlock_request failed for id = %d",
379374
params->resource_id);
380375
goto free_obj;
381376
}
@@ -385,7 +380,7 @@ void *gatehwspinlock_create(enum igatempsupport_local_protect local_protect,
385380
free_obj:
386381
kfree(obj);
387382
exit:
388-
printk(KERN_ERR "gatehwspinlock_create failed status: %x\n", retval);
383+
pr_err("gatehwspinlock_create failed status: %x\n", retval);
389384
return NULL;
390385
}
391386
EXPORT_SYMBOL(gatehwspinlock_create);
@@ -427,7 +422,7 @@ int gatehwspinlock_delete(void **gphandle)
427422
return 0;
428423

429424
exit:
430-
printk(KERN_ERR "gatehwspinlock_delete failed status: %x\n", retval);
425+
pr_err("gatehwspinlock_delete failed status: %x\n", retval);
431426
return retval;
432427
}
433428
EXPORT_SYMBOL(gatehwspinlock_delete);
@@ -480,8 +475,7 @@ int *gatehwspinlock_enter(void *gphandle)
480475

481476
exit:
482477
if (retval < 0)
483-
printk(KERN_ERR "gatehwspinlock_enter failed! status = 0x%x",
484-
retval);
478+
pr_err("gatehwspinlock_enter failed! status = 0x%x", retval);
485479
return key;
486480
}
487481
EXPORT_SYMBOL(gatehwspinlock_enter);
@@ -522,8 +516,7 @@ void gatehwspinlock_leave(void *gphandle, int *key)
522516

523517
exit:
524518
if (retval < 0)
525-
printk(KERN_ERR "gatehwspinlock_leave failed! status = 0x%x",
526-
retval);
519+
pr_err("gatehwspinlock_leave failed! status = 0x%x", retval);
527520
return;
528521
}
529522
EXPORT_SYMBOL(gatehwspinlock_leave);
@@ -552,8 +545,7 @@ static u32 gatehwspinlock_get_resource_id(void *handle)
552545
return obj->lock_num;
553546

554547
exit:
555-
printk(KERN_ERR "gatehwspinlock_get_resource_id failed status: %x\n",
556-
retval);
548+
pr_err("gatehwspinlock_get_resource_id failed status: %x\n", retval);
557549
return (u32)-1;
558550
}
559551
EXPORT_SYMBOL(gatehwspinlock_get_resource_id);

‎drivers/dsp/syslink/multicore_ipc/gatemp.c

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,7 @@ void gatemp_get_config(struct gatemp_config *cfg)
238238

239239
exit:
240240
if (retval < 0)
241-
printk(KERN_ERR "gatemp_get_config failed! status = 0x%x",
242-
retval);
241+
pr_err("gatemp_get_config failed! status = 0x%x", retval);
243242
return;
244243
}
245244

@@ -418,7 +417,7 @@ s32 gatemp_setup(const struct gatemp_config *cfg)
418417
kfree(gatemp_module->gate_mutex);
419418
gatemp_module->gate_mutex = NULL;
420419
exit:
421-
printk(KERN_ERR "gatemp_setup failed! status = 0x%x", retval);
420+
pr_err("gatemp_setup failed! status = 0x%x", retval);
422421
return retval;
423422
}
424423

@@ -476,7 +475,7 @@ s32 gatemp_destroy(void)
476475

477476
exit:
478477
if (retval < 0)
479-
printk(KERN_ERR "gatemp_destroy failed! status = 0x%x", retval);
478+
pr_err("gatemp_destroy failed! status = 0x%x", retval);
480479
return retval;
481480
}
482481

@@ -851,8 +850,7 @@ static int gatemp_instance_init(struct gatemp_object *obj,
851850
}
852851

853852
if (retval != 0) {
854-
printk(KERN_ERR "gatemp_instance_init failed! status = 0x%x",
855-
retval);
853+
pr_err("gatemp_instance_init failed! status = 0x%x", retval);
856854
}
857855
return retval;
858856
}
@@ -971,7 +969,7 @@ static void gatemp_instance_finalize(struct gatemp_object *obj, int status)
971969

972970
exit:
973971
if (retval < 0) {
974-
printk(KERN_ERR "gatemp_instance_finalize failed! "
972+
pr_err("gatemp_instance_finalize failed! "
975973
"status = 0x%x", retval);
976974
}
977975
return;
@@ -1049,7 +1047,7 @@ int gatemp_open(char *name, void **handle)
10491047

10501048
exit:
10511049
if (retval < 0)
1052-
printk(KERN_ERR "gatemp_open failed! status = 0x%x", retval);
1050+
pr_err("gatemp_open failed! status = 0x%x", retval);
10531051
return retval;
10541052
}
10551053

@@ -1155,10 +1153,8 @@ int gatemp_open_by_addr(void *shared_addr, void **handle)
11551153
}
11561154

11571155
exit:
1158-
if (retval < 0) {
1159-
printk(KERN_ERR "gatemp_open_by_addr failed! status = 0x%x",
1160-
retval);
1161-
}
1156+
if (retval < 0)
1157+
pr_err("gatemp_open_by_addr failed! status = 0x%x", retval);
11621158
return retval;
11631159
}
11641160

@@ -1206,7 +1202,7 @@ int gatemp_close(void **handle)
12061202
return 0;
12071203

12081204
exit:
1209-
printk(KERN_ERR "gatemp_close failed! status = 0x%x", retval);
1205+
pr_err("gatemp_close failed! status = 0x%x", retval);
12101206
return retval;
12111207
}
12121208

@@ -1449,7 +1445,7 @@ static void gatemp_set_region0_reserved(void *shared_addr)
14491445

14501446
static void gatemp_clear_region0_reserved(void)
14511447
{
1452-
printk(KERN_INFO "gatemp_clear_region0_reserved: either nothing to do "
1448+
pr_info("gatemp_clear_region0_reserved: either nothing to do "
14531449
"or not implemented");
14541450
}
14551451

@@ -1516,7 +1512,7 @@ static void gatemp_open_region0_reserved(void *shared_addr)
15161512

15171513
static void gatemp_close_region0_reserved(void *shared_addr)
15181514
{
1519-
printk(KERN_INFO "gatemp_close_region0_reserved: either nothing to do "
1515+
pr_info("gatemp_close_region0_reserved: either nothing to do "
15201516
"or not implemented");
15211517
}
15221518

@@ -1577,7 +1573,7 @@ int gatemp_start(void *shared_addr)
15771573
}
15781574

15791575
if (retval < 0)
1580-
printk(KERN_ERR "gatemp_start failed! status = 0x%x", retval);
1576+
pr_err("gatemp_start failed! status = 0x%x", retval);
15811577
return retval;
15821578
}
15831579

@@ -1683,7 +1679,7 @@ void *gatemp_create(const struct gatemp_params *params)
16831679

16841680
exit:
16851681
if (retval < 0)
1686-
printk(KERN_ERR "gatemp_create failed! status = 0x%x", retval);
1682+
pr_err("gatemp_create failed! status = 0x%x", retval);
16871683
return (void *)handle;
16881684
}
16891685

@@ -1722,7 +1718,7 @@ static struct gatemp_object *_gatemp_create(const struct _gatemp_params *params)
17221718
kfree(obj);
17231719
obj = NULL;
17241720
exit:
1725-
printk(KERN_ERR "_gatemp_create failed! status = 0x%x", retval);
1721+
pr_err("_gatemp_create failed! status = 0x%x", retval);
17261722
return (void *)NULL;
17271723
}
17281724

@@ -1776,7 +1772,7 @@ int gatemp_delete(void **handle)
17761772
return 0;
17771773

17781774
exit:
1779-
printk(KERN_ERR "gatemp_delete failed! status = 0x%x", retval);
1775+
pr_err("gatemp_delete failed! status = 0x%x", retval);
17801776
return retval;
17811777
}
17821778

@@ -1823,7 +1819,7 @@ int gatemp_attach(u16 remote_proc_id, void *shared_addr)
18231819

18241820
exit:
18251821
if (retval < 0)
1826-
printk(KERN_ERR "gatemp_attach failed! status = 0x%x", retval);
1822+
pr_err("gatemp_attach failed! status = 0x%x", retval);
18271823
return retval;
18281824
}
18291825

@@ -1857,6 +1853,6 @@ int gatemp_detach(u16 remote_proc_id, void *shared_addr)
18571853

18581854
exit:
18591855
if (retval < 0)
1860-
printk(KERN_ERR "gatemp_detach failed! status = 0x%x", retval);
1856+
pr_err("gatemp_detach failed! status = 0x%x", retval);
18611857
return retval;
18621858
}

‎drivers/dsp/syslink/multicore_ipc/gatepeterson.c

Lines changed: 10 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,7 @@ int gatepeterson_setup(const struct gatepeterson_config *config)
209209
atomic_set(&gatepeterson_module->ref_count,
210210
GATEPETERSON_MAKE_MAGICSTAMP(0));
211211

212-
printk(KERN_ERR "gatepeterson_setup failed status: %x\n",
213-
retval);
212+
pr_err("gatepeterson_setup failed status: %x\n", retval);
214213
return retval;
215214
}
216215
EXPORT_SYMBOL(gatepeterson_setup);
@@ -272,12 +271,9 @@ int gatepeterson_destroy(void)
272271
return 0;
273272

274273
exit:
275-
if (retval < 0) {
276-
printk(KERN_ERR "gatepeterson_destroy failed status:%x\n",
277-
retval);
278-
}
274+
if (retval < 0)
275+
pr_err("gatepeterson_destroy failed status:%x\n", retval);
279276
return retval;
280-
281277
}
282278
EXPORT_SYMBOL(gatepeterson_destroy);
283279

@@ -418,10 +414,8 @@ static int gatepeterson_instance_init(struct gatepeterson_object *obj,
418414
}
419415

420416
exit:
421-
if (retval < 0) {
422-
printk(KERN_ERR "gatemp_instance_init failed! status = 0x%x",
423-
retval);
424-
}
417+
if (retval < 0)
418+
pr_err("gatemp_instance_init failed! status = 0x%x", retval);
425419
return retval;
426420
}
427421

@@ -545,8 +539,7 @@ int gatepeterson_delete(void **gphandle)
545539
return 0;
546540

547541
exit:
548-
printk(KERN_ERR "gatepeterson_delete failed status: %x\n",
549-
retval);
542+
pr_err("gatepeterson_delete failed status: %x\n", retval);
550543
return retval;
551544
}
552545
EXPORT_SYMBOL(gatepeterson_delete);
@@ -604,7 +597,7 @@ int gatepeterson_open_by_addr(enum igatempsupport_local_protect local_protect,
604597
return 0;
605598

606599
exit:
607-
printk(KERN_ERR "gatepeterson_open failed status: %x\n", retval);
600+
pr_err("gatepeterson_open failed status: %x\n", retval);
608601
return retval;
609602
}
610603
EXPORT_SYMBOL(gatepeterson_open_by_addr);
@@ -668,7 +661,7 @@ int gatepeterson_close(void **gphandle)
668661
gatemp_leave(obj->local_gate, key);
669662

670663
exit:
671-
printk(KERN_ERR "gatepeterson_close failed status: %x\n", retval);
664+
pr_err("gatepeterson_close failed status: %x\n", retval);
672665
return retval;
673666
}
674667
EXPORT_SYMBOL(gatepeterson_close);
@@ -939,10 +932,10 @@ static void *_gatepeterson_create(enum igatempsupport_local_protect
939932

940933
exit:
941934
if (create_flag == true)
942-
printk(KERN_ERR "_gatepeterson_create (create) failed "
935+
pr_err("_gatepeterson_create (create) failed "
943936
"status: %x\n", status);
944937
else
945-
printk(KERN_ERR "_gatepeterson_create (open) failed "
938+
pr_err("_gatepeterson_create (open) failed "
946939
"status: %x\n", status);
947940

948941
return NULL;

0 commit comments

Comments
 (0)