提交 f4f3efda 编写于 作者: V Valentin Ilie 提交者: David S. Miller

net: can: af_can.c: Fix checkpatch warnings

Replace printk(KERN_ERR with pr_err
Add space before {
Removed OOM messages
Signed-off-by: NValentin Ilie <valentin.ilie@gmail.com>
Acked-by: NOliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 73e04683
...@@ -525,7 +525,7 @@ void can_rx_unregister(struct net_device *dev, canid_t can_id, canid_t mask, ...@@ -525,7 +525,7 @@ void can_rx_unregister(struct net_device *dev, canid_t can_id, canid_t mask,
d = find_dev_rcv_lists(dev); d = find_dev_rcv_lists(dev);
if (!d) { if (!d) {
printk(KERN_ERR "BUG: receive list not found for " pr_err("BUG: receive list not found for "
"dev %s, id %03X, mask %03X\n", "dev %s, id %03X, mask %03X\n",
DNAME(dev), can_id, mask); DNAME(dev), can_id, mask);
goto out; goto out;
...@@ -552,7 +552,7 @@ void can_rx_unregister(struct net_device *dev, canid_t can_id, canid_t mask, ...@@ -552,7 +552,7 @@ void can_rx_unregister(struct net_device *dev, canid_t can_id, canid_t mask,
*/ */
if (!r) { if (!r) {
printk(KERN_ERR "BUG: receive list entry not found for " pr_err("BUG: receive list entry not found for "
"dev %s, id %03X, mask %03X\n", "dev %s, id %03X, mask %03X\n",
DNAME(dev), can_id, mask); DNAME(dev), can_id, mask);
r = NULL; r = NULL;
...@@ -749,8 +749,7 @@ int can_proto_register(const struct can_proto *cp) ...@@ -749,8 +749,7 @@ int can_proto_register(const struct can_proto *cp)
int err = 0; int err = 0;
if (proto < 0 || proto >= CAN_NPROTO) { if (proto < 0 || proto >= CAN_NPROTO) {
printk(KERN_ERR "can: protocol number %d out of range\n", pr_err("can: protocol number %d out of range\n", proto);
proto);
return -EINVAL; return -EINVAL;
} }
...@@ -761,8 +760,7 @@ int can_proto_register(const struct can_proto *cp) ...@@ -761,8 +760,7 @@ int can_proto_register(const struct can_proto *cp)
mutex_lock(&proto_tab_lock); mutex_lock(&proto_tab_lock);
if (proto_tab[proto]) { if (proto_tab[proto]) {
printk(KERN_ERR "can: protocol %d already registered\n", pr_err("can: protocol %d already registered\n", proto);
proto);
err = -EBUSY; err = -EBUSY;
} else } else
RCU_INIT_POINTER(proto_tab[proto], cp); RCU_INIT_POINTER(proto_tab[proto], cp);
...@@ -816,11 +814,8 @@ static int can_notifier(struct notifier_block *nb, unsigned long msg, ...@@ -816,11 +814,8 @@ static int can_notifier(struct notifier_block *nb, unsigned long msg,
/* create new dev_rcv_lists for this device */ /* create new dev_rcv_lists for this device */
d = kzalloc(sizeof(*d), GFP_KERNEL); d = kzalloc(sizeof(*d), GFP_KERNEL);
if (!d) { if (!d)
printk(KERN_ERR
"can: allocation of receive list failed\n");
return NOTIFY_DONE; return NOTIFY_DONE;
}
BUG_ON(dev->ml_priv); BUG_ON(dev->ml_priv);
dev->ml_priv = d; dev->ml_priv = d;
...@@ -838,8 +833,8 @@ static int can_notifier(struct notifier_block *nb, unsigned long msg, ...@@ -838,8 +833,8 @@ static int can_notifier(struct notifier_block *nb, unsigned long msg,
dev->ml_priv = NULL; dev->ml_priv = NULL;
} }
} else } else
printk(KERN_ERR "can: notifier: receive list not " pr_err("can: notifier: receive list not found for dev "
"found for dev %s\n", dev->name); "%s\n", dev->name);
spin_unlock(&can_rcvlists_lock); spin_unlock(&can_rcvlists_lock);
...@@ -927,7 +922,7 @@ static __exit void can_exit(void) ...@@ -927,7 +922,7 @@ static __exit void can_exit(void)
/* remove created dev_rcv_lists from still registered CAN devices */ /* remove created dev_rcv_lists from still registered CAN devices */
rcu_read_lock(); rcu_read_lock();
for_each_netdev_rcu(&init_net, dev) { for_each_netdev_rcu(&init_net, dev) {
if (dev->type == ARPHRD_CAN && dev->ml_priv){ if (dev->type == ARPHRD_CAN && dev->ml_priv) {
struct dev_rcv_lists *d = dev->ml_priv; struct dev_rcv_lists *d = dev->ml_priv;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册