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 | |
parent | 568fc588fce85602e4e2c7573f6f912311306b72 (diff) |
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')
-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) | |||
3009 | 3009 | ||
3010 | static void link_print(struct tipc_link *l_ptr, const char *str) | 3010 | static void link_print(struct tipc_link *l_ptr, const char *str) |
3011 | { | 3011 | { |
3012 | char print_area[256]; | 3012 | pr_info("%s Link %x<%s>:", str, l_ptr->addr, l_ptr->b_ptr->name); |
3013 | struct print_buf pb; | ||
3014 | struct print_buf *buf = &pb; | ||
3015 | |||
3016 | tipc_printbuf_init(buf, print_area, sizeof(print_area)); | ||
3017 | |||
3018 | tipc_printf(buf, str); | ||
3019 | tipc_printf(buf, "Link %x<%s>:", | ||
3020 | l_ptr->addr, l_ptr->b_ptr->name); | ||
3021 | 3013 | ||
3022 | if (link_working_unknown(l_ptr)) | 3014 | if (link_working_unknown(l_ptr)) |
3023 | tipc_printf(buf, ":WU"); | 3015 | pr_cont(":WU\n"); |
3024 | else if (link_reset_reset(l_ptr)) | 3016 | else if (link_reset_reset(l_ptr)) |
3025 | tipc_printf(buf, ":RR"); | 3017 | pr_cont(":RR\n"); |
3026 | else if (link_reset_unknown(l_ptr)) | 3018 | else if (link_reset_unknown(l_ptr)) |
3027 | tipc_printf(buf, ":RU"); | 3019 | pr_cont(":RU\n"); |
3028 | else if (link_working_working(l_ptr)) | 3020 | else if (link_working_working(l_ptr)) |
3029 | tipc_printf(buf, ":WW"); | 3021 | pr_cont(":WW\n"); |
3030 | tipc_printf(buf, "\n"); | 3022 | else |
3031 | 3023 | pr_cont("\n"); | |
3032 | tipc_printbuf_validate(buf); | ||
3033 | pr_info("%s", print_area); | ||
3034 | } | 3024 | } |