summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Zerpies <manuel.f.zerpies@ww.stud.uni-erlangen.de>2011-06-16 02:08:01 +0000
committerDavid S. Miller <davem@conan.davemloft.net>2011-06-17 00:03:03 -0400
commitd751e623969bf758f3f75f59418b19ede570ab50 (patch)
treed6edb04403f308f5019efd0a1ae962fa9c947c1b
parentc63d6ea3060d9e10773e869b1112e3a0efbcf820 (diff)
downloadop-kernel-dev-d751e623969bf758f3f75f59418b19ede570ab50.zip
op-kernel-dev-d751e623969bf758f3f75f59418b19ede570ab50.tar.gz
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>
-rw-r--r--net/can/af_can.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/can/af_can.c b/net/can/af_can.c
index 094fc53..8ce926d 100644
--- a/net/can/af_can.c
+++ b/net/can/af_can.c
@@ -58,6 +58,7 @@
#include <linux/skbuff.h>
#include <linux/can.h>
#include <linux/can/core.h>
+#include <linux/ratelimit.h>
#include <net/net_namespace.h>
#include <net/sock.h>
@@ -161,8 +162,8 @@ static int can_create(struct net *net, struct socket *sock, int protocol,
* return the error code immediately. Below we will
* return -EPROTONOSUPPORT
*/
- if (err && printk_ratelimit())
- printk(KERN_ERR "can: request_module "
+ if (err)
+ printk_ratelimited(KERN_ERR "can: request_module "
"(can-proto-%d) failed.\n", protocol);
cp = can_get_proto(protocol);
OpenPOWER on IntegriCloud