diff options
author | Joe Perches <joe@perches.com> | 2016-06-02 21:08:52 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-06-04 01:41:31 +0200 |
commit | 9b6d53985fd130c24ad2260c2edb0df50449f020 (patch) | |
tree | 5aef3e327ab46265ec3536ff5e7c2979ff1b180f /net/rxrpc/ar-key.c | |
parent | hv_netvsc: Fix VF register on vlan devices (diff) | |
download | linux-9b6d53985fd130c24ad2260c2edb0df50449f020.tar.xz linux-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-key.c')
-rw-r--r-- | net/rxrpc/ar-key.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/rxrpc/ar-key.c b/net/rxrpc/ar-key.c index 1021b4c0bdd2..4ad56fafe3a7 100644 --- a/net/rxrpc/ar-key.c +++ b/net/rxrpc/ar-key.c @@ -12,6 +12,8 @@ * "afs@CAMBRIDGE.REDHAT.COM> */ +#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt + #include <crypto/skcipher.h> #include <linux/module.h> #include <linux/net.h> @@ -800,7 +802,7 @@ static void rxrpc_free_token_list(struct rxrpc_key_token *token) rxrpc_rxk5_free(token->k5); break; default: - printk(KERN_ERR "Unknown token type %x on rxrpc key\n", + pr_err("Unknown token type %x on rxrpc key\n", token->security_index); BUG(); } |