diff options
| author |   Joe Perches <joe@perches.com> | 2016-06-02 12:08:52 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-06-03 19:41:31 -0400 |
| commit | 9b6d53985fd130c24ad2260c2edb0df50449f020 (patch) | |
| tree | 5aef3e327ab46265ec3536ff5e7c2979ff1b180f /net/rxrpc/ar-call.c | |
| parent | hv_netvsc: Fix VF register on vlan devices (diff) | |
| download | linux-dev-9b6d53985fd130c24ad2260c2edb0df50449f020.tar.xz linux-dev-9b6d53985fd130c24ad2260c2edb0df50449f020.zip | |
rxrpc: Use pr_<level> and pr_fmt, reduce object size a few KB
Use the more common kernel logging style and reduce object size.
The logging message prefix changes from a mixture of
"RxRPC:" and "RXRPC:" to "af_rxrpc: ".
$ size net/rxrpc/built-in.o*
text data bss dec hex filename
64172 1972 8304 74448 122d0 net/rxrpc/built-in.o.new
67512 1972 8304 77788 12fdc net/rxrpc/built-in.o.old
Miscellanea:
o Consolidate the ASSERT macros to use a single pr_err call with
decimal and hexadecimal output and a stringified #OP argument
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/rxrpc/ar-call.c')
| -rw-r--r-- | net/rxrpc/ar-call.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/net/rxrpc/ar-call.c b/net/rxrpc/ar-call.c index 571a41fd5a32..1fbaae1cba5f 100644 --- a/net/rxrpc/ar-call.c +++ b/net/rxrpc/ar-call.c @@ -9,6 +9,8 @@ * 2 of the License, or (at your option) any later version. */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <linux/slab.h> #include <linux/module.h> #include <linux/circ_buf.h> @@ -669,8 +671,7 @@ void rxrpc_release_call(struct rxrpc_call *call) conn->channels[3] == NULL); break; default: - printk(KERN_ERR "RxRPC: conn->avail_calls=%d\n", - conn->avail_calls); + pr_err("conn->avail_calls=%d\n", conn->avail_calls); BUG(); } } @@ -935,16 +936,15 @@ void __exit rxrpc_destroy_all_calls(void) if (call->state != RXRPC_CALL_DEAD) break; default: - printk(KERN_ERR "RXRPC:" - " Call %p still in use (%d,%d,%s,%lx,%lx)!\n", + pr_err("Call %p still in use (%d,%d,%s,%lx,%lx)!\n", call, atomic_read(&call->usage), atomic_read(&call->ackr_not_idle), rxrpc_call_states[call->state], call->flags, call->events); if (!skb_queue_empty(&call->rx_queue)) - printk(KERN_ERR"RXRPC: Rx queue occupied\n"); + pr_err("Rx queue occupied\n"); if (!skb_queue_empty(&call->rx_oos_queue)) - printk(KERN_ERR"RXRPC: OOS queue occupied\n"); + pr_err("OOS queue occupied\n"); break; } |