From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: davem@davemloft.net
Cc: netdev@vger.kernel.org, Jon Maloy <jon.maloy@ericsson.com>,
Erik Hugne <erik.hugne@ericsson.com>,
ying.xue@windriver.com,
Paul Gortmaker <paul.gortmaker@windriver.com>
Subject: [PATCH net-next 5/8] tipc: simplify link_print by divorcing it from using tipc_printf
Date: Thu, 12 Jul 2012 12:39:58 -0400 [thread overview]
Message-ID: <1342111201-9426-6-git-send-email-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <1342111201-9426-1-git-send-email-paul.gortmaker@windriver.com>
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>
---
net/tipc/link.c | 24 +++++++-----------------
1 file changed, 7 insertions(+), 17 deletions(-)
diff --git a/net/tipc/link.c b/net/tipc/link.c
index b389ab9..bf4cc41 100644
--- a/net/tipc/link.c
+++ b/net/tipc/link.c
@@ -3008,26 +3008,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("TIPC: %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("TIPC: %s", print_area);
+ pr_cont(":WW\n");
+ else
+ pr_cont("\n");
}
--
1.7.9.7
next prev parent reply other threads:[~2012-07-12 16:40 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-12 16:39 [PATCH net-next 0/8] tipc: kill off struct print_buf/log Paul Gortmaker
2012-07-12 16:39 ` [PATCH net-next 1/8] tipc: factor stats struct out of the larger link struct Paul Gortmaker
2012-07-12 16:39 ` [PATCH net-next 2/8] tipc: limit error messages relating to memory leak to one line Paul Gortmaker
2012-07-12 16:39 ` [PATCH net-next 3/8] tipc: use standard printk shortcut macros (pr_err etc.) Paul Gortmaker
2012-07-13 23:53 ` [PATCH net-next v2 " Paul Gortmaker
2012-07-12 16:39 ` [PATCH net-next 4/8] tipc: remove TIPC packet debugging functions and macros Paul Gortmaker
2012-07-12 16:39 ` Paul Gortmaker [this message]
2012-07-12 16:39 ` [PATCH net-next 6/8] tipc: simplify print buffer handling in tipc_printf Paul Gortmaker
2012-07-12 16:40 ` [PATCH net-next 7/8] tipc: phase out most of the struct print_buf usage Paul Gortmaker
2012-07-12 16:40 ` [PATCH net-next 8/8] tipc: remove print_buf and deprecated log buffer code Paul Gortmaker
2012-07-12 17:51 ` [PATCH net-next] tipc: Use pr_fmt Joe Perches
2012-07-13 15:45 ` Paul Gortmaker
2012-07-13 19:04 ` Joe Perches
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1342111201-9426-6-git-send-email-paul.gortmaker@windriver.com \
--to=paul.gortmaker@windriver.com \
--cc=davem@davemloft.net \
--cc=erik.hugne@ericsson.com \
--cc=jon.maloy@ericsson.com \
--cc=netdev@vger.kernel.org \
--cc=ying.xue@windriver.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).