net: can: af_can.c: Fix checkpatch warnings
Subsystems (4)
PATCH 1/1 net: can: af_can.c: Fix checkpatch warnings
Replace printk(KERN_ERR with pr_err
Add space before {
--- net/can/af_can.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-)
net/can/af_can.c +7 -8
@@ -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);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" ,DNAME (dev), can_id, mask); goto out;
@@ -552,7 +552,7 @@ void can_rx_unregister(struct net_device *dev, canid_t can_id, canid_t mask,*/ 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" ,DNAME (dev), can_id, mask); r =NULL ;
@@ -749,7 +749,7 @@ int can_proto_register(const struct can_proto *cp)int err =0 ;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);return -EINVAL ; }
@@ -761,7 +761,7 @@ int can_proto_register(const struct can_proto *cp)mutex_lock (&proto_tab_lock);if (proto_tab[proto]) { -printk (KERN_ERR "can: protocol %d already registered\n" , +pr_err ("can: protocol %d already registered\n" , proto); err = -EBUSY ; }else
@@ -817,8 +817,7 @@ static int can_notifier(struct notifier_block *nb, unsigned long msg,/* create new dev_rcv_lists for this device */ d =kzalloc (sizeof (*d),GFP_KERNEL );if (!d) { -printk (KERN_ERR -"can: allocation of receive list failed\n" ); +pr_err ("can: allocation of receive list failed\n" );return NOTIFY_DONE ; }BUG_ON (dev->ml_priv);
@@ -838,7 +837,7 @@ static int can_notifier(struct notifier_block *nb, unsigned long msg, dev->ml_priv =NULL ; } }else -printk (KERN_ERR "can: notifier: receive list not " +pr_err ("can: notifier: receive list not " "found for dev %s\n" , dev->name);spin_unlock (&can_rcvlists_lock);
@@ -927,7 +926,7 @@ static __exit void can_exit(void)/* remove created dev_rcv_lists from still registered CAN devices */ rcu_read_lock ();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;
Signature · 1 line
1.8.1.2
Oliver Hartkopp
maintainerHallo Valentin,
thanks for the idea for the cleanup.
But if you replace the the printk() statements it's worth to check if code fits into a single line now, e.g.
On 10.03.2013 13:28, Valentin Ilie wrote:
r = NULL;
net/can/af_can.c int can_proto_register(const struct can_proto *cp) · line 753
Quoted 7 lines
net/can/af_can.c +1
-1@@ -749,7 +749,7 @@ int can_proto_register(const struct can_proto *cp)int err =0 ;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);
here " ,proto);" can obviously be move into the previous line while preserving the 80 chars per line rule.
net/can/af_can.c int can_proto_register(const struct can_proto *cp) · line 765
Quoted 9 lines
net/can/af_can.c +1
-1return -EINVAL ; }@@ -761,7 +761,7 @@ int can_proto_register(const struct can_proto *cp)mutex_lock (&proto_tab_lock);if (proto_tab[proto]) { -printk (KERN_ERR "can: protocol %d already registered\n" , +pr_err ("can: protocol %d already registered\n" , proto);
here too
net/can/af_can.c static int can_notifier(struct notifier_block *nb, unsigned long msg, · line 822
Quoted 11 lines
net/can/af_can.c +1
-2err = -EBUSY ; }else @@ -817,8 +817,7 @@ static int can_notifier(struct notifier_block *nb, unsigned long msg,/* create new dev_rcv_lists for this device */ d =kzalloc (sizeof (*d),GFP_KERNEL );if (!d) { -printk (KERN_ERR -"can: allocation of receive list failed\n" ); +pr_err ("can: allocation of receive list failed\n" );return NOTIFY_DONE ; }
As i've seen in former patches from Joe Perches OOM messages are obsolete.
You could write
if(!d)
return NOTIFY_DONE;
here instead.
Thanks,
Oliver
Quoted 51 lines · Oliver Hartkopp
Hallo Valentin,
thanks for the idea for the cleanup.
But if you replace the the
printk()statements it's worth to check if code fits into a single line now, e.g.On 10.03.2013 13:28, Valentin Ilie wrote:
r = NULL;net/can/af_can.c int can_proto_register(const struct can_proto *cp) · line 753
Quoted 7 lines
net/can/af_can.c +1
-1@@ -749,7 +749,7 @@ int can_proto_register(const struct can_proto *cp)int err =0 ;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);here " ,proto);" can obviously be move into the previous line while preserving the 80 chars per line rule.
net/can/af_can.c int can_proto_register(const struct can_proto *cp) · line 765
Quoted 9 lines
net/can/af_can.c +1
-1return -EINVAL ; }@@ -761,7 +761,7 @@ int can_proto_register(const struct can_proto *cp)mutex_lock (&proto_tab_lock);if (proto_tab[proto]) { -printk (KERN_ERR "can: protocol %d already registered\n" , +pr_err ("can: protocol %d already registered\n" , proto);here too
net/can/af_can.c static int can_notifier(struct notifier_block *nb, unsigned long msg, · line 822
Quoted 11 lines
net/can/af_can.c +1
-2err = -EBUSY ; }else @@ -817,8 +817,7 @@ static int can_notifier(struct notifier_block *nb, unsigned long msg,/* create new dev_rcv_lists for this device */ d =kzalloc (sizeof (*d),GFP_KERNEL );if (!d) { -printk (KERN_ERR -"can: allocation of receive list failed\n" ); +pr_err ("can: allocation of receive list failed\n" );return NOTIFY_DONE ; }As i've seen in former patches from Joe Perches OOM messages are obsolete.
Quoted 6 lines
You could write
if(!d)
return NOTIFY_DONE;here instead.
While at it, why not switch to dev_err() instead?
Daniel
Oliver Hartkopp
maintainerQuoted 13 lines · Daniel Mack
Quoted 13 lines
net/can/af_can.c static int can_notifier(struct notifier_block *nb, unsigned long msg, · line 822
Quoted 9 lines
net/can/af_can.c +1
-2@@ -817,8 +817,7 @@ static int can_notifier(struct notifier_block *nb, unsigned long msg,/* create new dev_rcv_lists for this device */ d =kzalloc (sizeof (*d),GFP_KERNEL );if (!d) { -printk (KERN_ERR -"can: allocation of receive list failed\n" ); +pr_err ("can: allocation of receive list failed\n" );return NOTIFY_DONE ; }As i've seen in former patches from Joe Perches OOM messages are obsolete.
Quoted 8 lines
Quoted 6 lines
You could write
if(!d)
return NOTIFY_DONE;here instead.
While at it, why not switch to
dev_err()instead?
Hm, no.
1. pr_err() would be fine, as dev_err() is for drivers - and we're in linux/net here and not in linux/drivers
2. When removing the entire printk() statement there's nothing to be modified left
Regards,
Oliver
PATCH v2 1/1 net: can: af_can.c: Fix checkpatch warnings
In reply to Valentin IlieReplace printk(KERN_ERR with pr_err
Add space before {
Removed OOM messages
--- net/can/af_can.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-)
net/can/af_can.c +8 -13
@@ -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);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" ,DNAME (dev), can_id, mask); goto out;
@@ -552,7 +552,7 @@ void can_rx_unregister(struct net_device *dev, canid_t can_id, canid_t mask,*/ 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" ,DNAME (dev), can_id, mask); r =NULL ;
@@ -749,8 +749,7 @@ int can_proto_register(const struct can_proto *cp)int err =0 ;if (proto <0 || proto >=CAN_NPROTO ) { -printk (KERN_ERR "can: protocol number %d out of range\n" , - proto); +pr_err ("can: protocol number %d out of range\n" , proto);return -EINVAL ; }
@@ -761,8 +760,7 @@ int can_proto_register(const struct can_proto *cp)mutex_lock (&proto_tab_lock);if (proto_tab[proto]) { -printk (KERN_ERR "can: protocol %d already registered\n" , - proto); +pr_err ("can: protocol %d already registered\n" , proto); err = -EBUSY ; }else RCU_INIT_POINTER (proto_tab[proto], cp);
@@ -816,11 +814,8 @@ static int can_notifier(struct notifier_block *nb, unsigned long msg,/* create new dev_rcv_lists for this device */ d =kzalloc (sizeof (*d),GFP_KERNEL ); -if (!d) { -printk (KERN_ERR -"can: allocation of receive list failed\n" ); +if (!d)return NOTIFY_DONE ; - }BUG_ON (dev->ml_priv); dev->ml_priv = d;
@@ -838,8 +833,8 @@ static int can_notifier(struct notifier_block *nb, unsigned long msg, dev->ml_priv =NULL ; } }else -printk (KERN_ERR "can: notifier: receive list not " -"found for dev %s\n" , dev->name); +pr_err ("can: notifier: receive list not found for dev " +"%s\n" , dev->name);spin_unlock (&can_rcvlists_lock);
@@ -927,7 +922,7 @@ static __exit void can_exit(void)/* remove created dev_rcv_lists from still registered CAN devices */ rcu_read_lock ();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;
Signature · 1 line
1.8.1.2
Quoted 5 lines · Valentin Ilie
Replace printk(KERN_ERR with
pr_err
Add space before {
Removed OOM messagesSigned-off-by Valentin Ilie <[email protected]>
Thanks Valentin
Quoted 79 lines
--- net/can/af_can.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-)net/can/af_can.c +8
-13@@ -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);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" ,DNAME (dev), can_id, mask); goto out;@@ -552,7 +552,7 @@ void can_rx_unregister(struct net_device *dev, canid_t can_id, canid_t mask,*/ 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" ,DNAME (dev), can_id, mask); r =NULL ;@@ -749,8 +749,7 @@ int can_proto_register(const struct can_proto *cp)int err =0 ;if (proto <0 || proto >=CAN_NPROTO ) { -printk (KERN_ERR "can: protocol number %d out of range\n" , - proto); +pr_err ("can: protocol number %d out of range\n" , proto);return -EINVAL ; }@@ -761,8 +760,7 @@ int can_proto_register(const struct can_proto *cp)mutex_lock (&proto_tab_lock);if (proto_tab[proto]) { -printk (KERN_ERR "can: protocol %d already registered\n" , - proto); +pr_err ("can: protocol %d already registered\n" , proto); err = -EBUSY ; }else RCU_INIT_POINTER (proto_tab[proto], cp);@@ -816,11 +814,8 @@ static int can_notifier(struct notifier_block *nb, unsigned long msg,/* create new dev_rcv_lists for this device */ d =kzalloc (sizeof (*d),GFP_KERNEL ); -if (!d) { -printk (KERN_ERR -"can: allocation of receive list failed\n" ); +if (!d)return NOTIFY_DONE ; - }BUG_ON (dev->ml_priv); dev->ml_priv = d;@@ -838,8 +833,8 @@ static int can_notifier(struct notifier_block *nb, unsigned long msg, dev->ml_priv =NULL ; } }else -printk (KERN_ERR "can: notifier: receive list not " -"found for dev %s\n" , dev->name); +pr_err ("can: notifier: receive list not found for dev " +"%s\n" , dev->name);spin_unlock (&can_rcvlists_lock);@@ -927,7 +922,7 @@ static __exit void can_exit(void)/* remove created dev_rcv_lists from still registered CAN devices */ rcu_read_lock ();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;
From: Oliver Hartkopp <[email protected]>
Date: Mon, 11 Mar 2013 08:02:43 +0100
Quoted 10 lines · Valentin Ilie
Quoted 6 lines
Replace printk(KERN_ERR with
pr_err
Add space before {
Removed OOM messagesSigned-off-by Valentin Ilie <[email protected]>Acked-by Oliver Hartkopp <[email protected]>
Applied, thanks.