diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-07-11 19:27:56 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2012-07-13 19:27:57 -0400 |
| commit | 5deedde9fa65c494c9747dd66b1721be90991b64 (patch) | |
| tree | 646582187a20e8291c0fa79d1241bbd7f71dfa97 /net/tipc/link.c | |
| parent | 568fc588fce85602e4e2c7573f6f912311306b72 (diff) | |
| download | linux-stable-5deedde9fa65c494c9747dd66b1721be90991b64.tar.gz linux-stable-5deedde9fa65c494c9747dd66b1721be90991b64.tar.bz2 linux-stable-5deedde9fa65c494c9747dd66b1721be90991b64.zip | |
tipc: simplify link_print by divorcing it from using tipc_printf
To pave the way for a pending cleanup of tipc_printf, and
removal of struct print_buf entirely, we make that task simpler
by converting link_print to issue its messages with standard
printk infrastructure. [Original idea separated from a larger
patch from Erik Hugne <erik.hugne@ericsson.com>]
Cc: Erik Hugne <erik.hugne@ericsson.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Diffstat (limited to 'net/tipc/link.c')
| -rw-r--r-- | net/tipc/link.c | 24 |
1 files changed, 7 insertions, 17 deletions
diff --git a/net/tipc/link.c b/net/tipc/link.c index 9ba70c971142..a9a8b866d30a 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c @@ -3009,26 +3009,16 @@ u32 tipc_link_get_max_pkt(u32 dest, u32 selector) static void link_print(struct tipc_link *l_ptr, const char *str) { - char print_area[256]; - struct print_buf pb; - struct print_buf *buf = &pb; - - tipc_printbuf_init(buf, print_area, sizeof(print_area)); - - tipc_printf(buf, str); - tipc_printf(buf, "Link %x<%s>:", - l_ptr->addr, l_ptr->b_ptr->name); + pr_info("%s Link %x<%s>:", str, l_ptr->addr, l_ptr->b_ptr->name); if (link_working_unknown(l_ptr)) - tipc_printf(buf, ":WU"); + pr_cont(":WU\n"); else if (link_reset_reset(l_ptr)) - tipc_printf(buf, ":RR"); + pr_cont(":RR\n"); else if (link_reset_unknown(l_ptr)) - tipc_printf(buf, ":RU"); + pr_cont(":RU\n"); else if (link_working_working(l_ptr)) - tipc_printf(buf, ":WW"); - tipc_printf(buf, "\n"); - - tipc_printbuf_validate(buf); - pr_info("%s", print_area); + pr_cont(":WW\n"); + else + pr_cont("\n"); } |