diff options
author | Joe Perches <joe@perches.com> | 2012-03-11 14:36:11 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-03-12 02:42:51 -0400 |
commit | 058bd4d2a4ff0aaa4a5381c67e776729d840c785 (patch) | |
tree | 4d1ea864a8740676c7e7c5a03cdaa67fc5f29418 /net/ipv4/ipcomp.c | |
parent | 43db362d3adda9e0a915ddb9a8d1a41186e19179 (diff) |
net: Convert printks to pr_<level>
Use a more current kernel messaging style.
Convert a printk block to print_hex_dump.
Coalesce formats, align arguments.
Use %s, __func__ instead of embedding function names.
Some messages that were prefixed with <foo>_close are
now prefixed with <foo>_fini. Some ah4 and esp messages
are now not prefixed with "ip ".
The intent of this patch is to later add something like
#define pr_fmt(fmt) "IPv4: " fmt.
to standardize the output messages.
Text size is trivially reduced. (x86-32 allyesconfig)
$ size net/ipv4/built-in.o*
text data bss dec hex filename
887888 31558 249696 1169142 11d6f6 net/ipv4/built-in.o.new
887934 31558 249800 1169292 11d78c net/ipv4/built-in.o.old
Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ipcomp.c')
-rw-r--r-- | net/ipv4/ipcomp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/ipv4/ipcomp.c b/net/ipv4/ipcomp.c index c857f6f49b03..63b64c45a826 100644 --- a/net/ipv4/ipcomp.c +++ b/net/ipv4/ipcomp.c | |||
@@ -156,11 +156,11 @@ static const struct net_protocol ipcomp4_protocol = { | |||
156 | static int __init ipcomp4_init(void) | 156 | static int __init ipcomp4_init(void) |
157 | { | 157 | { |
158 | if (xfrm_register_type(&ipcomp_type, AF_INET) < 0) { | 158 | if (xfrm_register_type(&ipcomp_type, AF_INET) < 0) { |
159 | printk(KERN_INFO "ipcomp init: can't add xfrm type\n"); | 159 | pr_info("%s: can't add xfrm type\n", __func__); |
160 | return -EAGAIN; | 160 | return -EAGAIN; |
161 | } | 161 | } |
162 | if (inet_add_protocol(&ipcomp4_protocol, IPPROTO_COMP) < 0) { | 162 | if (inet_add_protocol(&ipcomp4_protocol, IPPROTO_COMP) < 0) { |
163 | printk(KERN_INFO "ipcomp init: can't add protocol\n"); | 163 | pr_info("%s: can't add protocol\n", __func__); |
164 | xfrm_unregister_type(&ipcomp_type, AF_INET); | 164 | xfrm_unregister_type(&ipcomp_type, AF_INET); |
165 | return -EAGAIN; | 165 | return -EAGAIN; |
166 | } | 166 | } |
@@ -170,9 +170,9 @@ static int __init ipcomp4_init(void) | |||
170 | static void __exit ipcomp4_fini(void) | 170 | static void __exit ipcomp4_fini(void) |
171 | { | 171 | { |
172 | if (inet_del_protocol(&ipcomp4_protocol, IPPROTO_COMP) < 0) | 172 | if (inet_del_protocol(&ipcomp4_protocol, IPPROTO_COMP) < 0) |
173 | printk(KERN_INFO "ip ipcomp close: can't remove protocol\n"); | 173 | pr_info("%s: can't remove protocol\n", __func__); |
174 | if (xfrm_unregister_type(&ipcomp_type, AF_INET) < 0) | 174 | if (xfrm_unregister_type(&ipcomp_type, AF_INET) < 0) |
175 | printk(KERN_INFO "ip ipcomp close: can't remove xfrm type\n"); | 175 | pr_info("%s: can't remove xfrm type\n", __func__); |
176 | } | 176 | } |
177 | 177 | ||
178 | module_init(ipcomp4_init); | 178 | module_init(ipcomp4_init); |