Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

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