tipc: use standard printk shortcut macros (pr_err etc.)
All messages should go directly to the kernel log. The TIPC specific error, warning, info and debug trace macro's are removed and all references replaced with pr_err, pr_warn, pr_info and pr_debug. Commonly used sub-strings are explicitly declared as a const char to reduce .text size. Note that this means the debug messages (changed to pr_debug), are now enabled through dynamic debugging, instead of a TIPC specific Kconfig option (TIPC_DEBUG). The latter will be phased out completely Signed-off-by: Erik Hugne <erik.hugne@ericsson.com> Signed-off-by: Jon Maloy <jon.maloy@ericsson.com> [PG: use pr_fmt as suggested by Joe Perches <joe@perches.com>] Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
This commit is contained in:
committed by
Paul Gortmaker
parent
f705ab956b
commit
2cf8aa19fe
@@ -153,11 +153,11 @@ u32 tipc_ref_acquire(void *object, spinlock_t **lock)
|
||||
struct reference *entry = NULL;
|
||||
|
||||
if (!object) {
|
||||
err("Attempt to acquire reference to non-existent object\n");
|
||||
pr_err("Attempt to acquire ref. to non-existent obj\n");
|
||||
return 0;
|
||||
}
|
||||
if (!tipc_ref_table.entries) {
|
||||
err("Reference table not found during acquisition attempt\n");
|
||||
pr_err("Ref. table not found in acquisition attempt\n");
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -211,7 +211,7 @@ void tipc_ref_discard(u32 ref)
|
||||
u32 index_mask;
|
||||
|
||||
if (!tipc_ref_table.entries) {
|
||||
err("Reference table not found during discard attempt\n");
|
||||
pr_err("Ref. table not found during discard attempt\n");
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -222,11 +222,11 @@ void tipc_ref_discard(u32 ref)
|
||||
write_lock_bh(&ref_table_lock);
|
||||
|
||||
if (!entry->object) {
|
||||
err("Attempt to discard reference to non-existent object\n");
|
||||
pr_err("Attempt to discard ref. to non-existent obj\n");
|
||||
goto exit;
|
||||
}
|
||||
if (entry->ref != ref) {
|
||||
err("Attempt to discard non-existent reference\n");
|
||||
pr_err("Attempt to discard non-existent reference\n");
|
||||
goto exit;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user