3 files changed, 18 insertions, 28 deletions

diff --git a/net/can/af_can.c b/net/can/af_can.c
index c48e5220bbac..c4e50852c9f4 100644
--- a/net/can/af_can.c
+++ b/net/can/af_can.c
@@ -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;
@@ -546,16 +546,13 @@ void can_rx_unregister(struct net_device *dev, canid_t can_id, canid_t mask,
         }
 
         /*
-         * Check for bugs in CAN protocol implementations:
-         * If no matching list item was found, the list cursor variable next
-         * will be NULL, while r will point to the last item of the list.
+         * Check for bugs in CAN protocol implementations using af_can.c:
+         * 'r' will be NULL if no matching list item was found for removal.
          */
 
         if (!r) {
-                printk(KERN_ERR "BUG: receive list entry not found for "
-                       "dev %s, id %03X, mask %03X\n",
-                       DNAME(dev), can_id, mask);
-                r = NULL;
+                WARN(1, "BUG: receive list entry not found for dev %s, "
+                     "id %03X, mask %03X\n", DNAME(dev), can_id, mask);
                 goto out;
         }
 
@@ -749,8 +746,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 +757,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 +811,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 +830,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 +919,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;
 
diff --git a/net/can/gw.c b/net/can/gw.c
index 2d117dc5ebea..3ee690e8c7d3 100644
--- a/net/can/gw.c
+++ b/net/can/gw.c
@@ -466,7 +466,7 @@ static int cgw_notifier(struct notifier_block *nb,
                         if (gwj->src.dev == dev || gwj->dst.dev == dev) {
                                 hlist_del(&gwj->list);
                                 cgw_unregister_filter(gwj);
-                                kfree(gwj);
+                                kmem_cache_free(cgw_cache, gwj);
                         }
                 }
         }
@@ -778,8 +778,7 @@ static int cgw_parse_attr(struct nlmsghdr *nlh, struct cf_mod *mod,
         return 0;
 }
 
-static int cgw_create_job(struct sk_buff *skb,  struct nlmsghdr *nlh,
-                          void *arg)
+static int cgw_create_job(struct sk_buff *skb,  struct nlmsghdr *nlh)
 {
         struct rtcanmsg *r;
         struct cgw_job *gwj;
@@ -864,11 +863,11 @@ static void cgw_remove_all_jobs(void)
         hlist_for_each_entry_safe(gwj, nx, &cgw_list, list) {
                 hlist_del(&gwj->list);
                 cgw_unregister_filter(gwj);
-                kfree(gwj);
+                kmem_cache_free(cgw_cache, gwj);
         }
 }
 
-static int cgw_remove_job(struct sk_buff *skb,  struct nlmsghdr *nlh, void *arg)
+static int cgw_remove_job(struct sk_buff *skb,  struct nlmsghdr *nlh)
 {
         struct cgw_job *gwj = NULL;
         struct hlist_node *nx;
@@ -920,7 +919,7 @@ static int cgw_remove_job(struct sk_buff *skb,  struct nlmsghdr *nlh, void *arg)
 
                 hlist_del(&gwj->list);
                 cgw_unregister_filter(gwj);
-                kfree(gwj);
+                kmem_cache_free(cgw_cache, gwj);
                 err = 0;
                 break;
         }
diff --git a/net/can/raw.c b/net/can/raw.c
index c1764e41ddaf..1085e65f848e 100644
--- a/net/can/raw.c
+++ b/net/can/raw.c
@@ -711,9 +711,8 @@ static int raw_sendmsg(struct kiocb *iocb, struct socket *sock,
         err = memcpy_fromiovec(skb_put(skb, size), msg->msg_iov, size);
         if (err < 0)
                 goto free_skb;
-        err = sock_tx_timestamp(sk, &skb_shinfo(skb)->tx_flags);
-        if (err < 0)
-                goto free_skb;
+
+        sock_tx_timestamp(sk, &skb_shinfo(skb)->tx_flags);
 
         skb->dev = dev;
         skb->sk  = sk;