diff options
author | Manuel Zerpies <manuel.f.zerpies@ww.stud.uni-erlangen.de> | 2011-06-15 22:08:01 -0400 |
---|---|---|
committer | David S. Miller <davem@conan.davemloft.net> | 2011-06-17 00:03:03 -0400 |
commit | d751e623969bf758f3f75f59418b19ede570ab50 (patch) | |
tree | d6edb04403f308f5019efd0a1ae962fa9c947c1b /net/can | |
parent | c63d6ea3060d9e10773e869b1112e3a0efbcf820 (diff) |
net/can: use printk_ratelimited() instead of printk_ratelimit()
Since printk_ratelimit() shouldn't be used anymore (see comment in
include/linux/printk.h), replace it with printk_ratelimited().
Signed-off-by: Manuel Zerpies <manuel.f.zerpies@ww.stud.uni-erlangen.de>
Signed-off-by: David S. Miller <davem@conan.davemloft.net>
Diffstat (limited to 'net/can')
-rw-r--r-- | net/can/af_can.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/can/af_can.c b/net/can/af_can.c index 094fc5332d42..8ce926d3b2cb 100644 --- a/net/can/af_can.c +++ b/net/can/af_can.c | |||
@@ -58,6 +58,7 @@ | |||
58 | #include <linux/skbuff.h> | 58 | #include <linux/skbuff.h> |
59 | #include <linux/can.h> | 59 | #include <linux/can.h> |
60 | #include <linux/can/core.h> | 60 | #include <linux/can/core.h> |
61 | #include <linux/ratelimit.h> | ||
61 | #include <net/net_namespace.h> | 62 | #include <net/net_namespace.h> |
62 | #include <net/sock.h> | 63 | #include <net/sock.h> |
63 | 64 | ||
@@ -161,8 +162,8 @@ static int can_create(struct net *net, struct socket *sock, int protocol, | |||
161 | * return the error code immediately. Below we will | 162 | * return the error code immediately. Below we will |
162 | * return -EPROTONOSUPPORT | 163 | * return -EPROTONOSUPPORT |
163 | */ | 164 | */ |
164 | if (err && printk_ratelimit()) | 165 | if (err) |
165 | printk(KERN_ERR "can: request_module " | 166 | printk_ratelimited(KERN_ERR "can: request_module " |
166 | "(can-proto-%d) failed.\n", protocol); | 167 | "(can-proto-%d) failed.\n", protocol); |
167 | 168 | ||
168 | cp = can_get_proto(protocol); | 169 | cp = can_get_proto(protocol); |