Merge tag 'linux-can-next-for-5.4-20190814' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next

Marc Kleine-Budde says:

====================
pull-request: can-next 2019-08-14

this is a pull request for net-next/master consisting of 41 patches.

The first two patches are for the kvaser_pciefd driver: Christer Beskow
removes unnecessary code in the kvaser_pciefd_pwm_stop() function,
YueHaibing removes the unused including of <linux/version.h>.

In the next patch YueHaibing also removes the unused including of
<linux/version.h> in the f81601 driver.

In the ti_hecc driver the next 6 patches are by me and fix checkpatch
warnings. YueHaibing's patch removes an unused variable in the
ti_hecc_mailbox_read() function.

The next 6 patches all target the xilinx_can driver. Anssi Hannula's
patch fixes a chip start failure with an invalid bus. The patch by
Venkatesh Yadav Abbarapu skips an error message in case of a deferred
probe. The 3 patches by Appana Durga Kedareswara rao fix the RX and TX
path for CAN-FD frames. Srinivas Neeli's patch fixes the bit timing
calculations for CAN-FD.

The next 12 patches are by me and several checkpatch warnings in the
af_can, raw and bcm components.

Thomas Gleixner provides a patch for the bcm, which switches the timer
to HRTIMER_MODE_SOFT and removes the hrtimer_tasklet.

Then 6 more patches by me for the gw component, which fix checkpatch
warnings, followed by 2 patches by Oliver Hartkopp to add CAN-FD
support.

The vcan driver gets 3 patches by me, fixing checkpatch warnings.

And finally a patch by Andre Hartmann to fix typos in CAN's netlink
header.
====================

1 files changed, 16 insertions, 18 deletions

diff --git a/net/can/raw.c b/net/can/raw.c
index da386f1fa815..fdbc36140e9b 100644
--- a/net/can/raw.c
+++ b/net/can/raw.c
@@ -1,6 +1,5 @@
 // SPDX-License-Identifier: ((GPL-2.0 WITH Linux-syscall-note) OR BSD-3-Clause)
-/*
- * raw.c - Raw sockets for protocol family CAN
+/* raw.c - Raw sockets for protocol family CAN
  *
  * Copyright (c) 2002-2007 Volkswagen Group Electronic Research
  * All rights reserved.
@@ -65,8 +64,7 @@ MODULE_ALIAS("can-proto-1");
 
 #define MASK_ALL 0
 
-/*
- * A raw socket has a list of can_filters attached to it, each receiving
+/* A raw socket has a list of can_filters attached to it, each receiving
  * the CAN frames matching that filter.  If the filter list is empty,
  * no CAN frames will be received by the socket.  The default after
  * opening the socket, is to have one filter which receives all frames.
@@ -97,8 +95,7 @@ struct raw_sock {
         struct uniqframe __percpu *uniq;
 };
 
-/*
- * Return pointer to store the extra msg flags for raw_recvmsg().
+/* Return pointer to store the extra msg flags for raw_recvmsg().
  * We use the space of one unsigned int beyond the 'struct sockaddr_can'
  * in skb->cb.
  */
@@ -157,8 +154,7 @@ static void raw_rcv(struct sk_buff *oskb, void *data)
         if (!skb)
                 return;
 
-        /*
-         *  Put the datagram to the queue so that raw_recvmsg() can
+        /*  Put the datagram to the queue so that raw_recvmsg() can
          *  get it from there.  We need to pass the interface index to
          *  raw_recvmsg().  We pass a whole struct sockaddr_can in skb->cb
          *  containing the interface index.
@@ -284,7 +280,6 @@ static int raw_notifier(struct notifier_block *nb,
                 return NOTIFY_DONE;
 
         switch (msg) {
-
         case NETDEV_UNREGISTER:
                 lock_sock(sk);
                 /* remove current filters & unregister */
@@ -370,8 +365,9 @@ static int raw_release(struct socket *sock)
                                 raw_disable_allfilters(dev_net(dev), dev, sk);
                                 dev_put(dev);
                         }
-                } else
+                } else {
                         raw_disable_allfilters(sock_net(sk), NULL, sk);
+                }
         }
 
         if (ro->count > 1)
@@ -451,8 +447,9 @@ static int raw_bind(struct socket *sock, struct sockaddr *uaddr, int len)
                                                                dev, sk);
                                         dev_put(dev);
                                 }
-                        } else
+                        } else {
                                 raw_disable_allfilters(sock_net(sk), NULL, sk);
+                        }
                 }
                 ro->ifindex = ifindex;
                 ro->bound = 1;
@@ -503,7 +500,6 @@ static int raw_setsockopt(struct socket *sock, int level, int optname,
                 return -EINVAL;
 
         switch (optname) {
-
         case CAN_RAW_FILTER:
                 if (optlen % sizeof(struct can_filter) != 0)
                         return -EINVAL;
@@ -666,17 +662,18 @@ static int raw_getsockopt(struct socket *sock, int level, int optname,
                 return -EINVAL;
 
         switch (optname) {
-
         case CAN_RAW_FILTER:
                 lock_sock(sk);
                 if (ro->count > 0) {
                         int fsize = ro->count * sizeof(struct can_filter);
+
                         if (len > fsize)
                                 len = fsize;
                         if (copy_to_user(optval, ro->filter, len))
                                 err = -EFAULT;
-                } else
+                } else {
                         len = 0;
+                }
                 release_sock(sk);
 
                 if (!err)
@@ -743,8 +740,9 @@ static int raw_sendmsg(struct socket *sock, struct msghdr *msg, size_t size)
                         return -EINVAL;
 
                 ifindex = addr->can_ifindex;
-        } else
+        } else {
                 ifindex = ro->ifindex;
+        }
 
         dev = dev_get_by_index(sock_net(sk), ifindex);
         if (!dev)
@@ -837,8 +835,8 @@ static int raw_recvmsg(struct socket *sock, struct msghdr *msg, size_t size,
         return size;
 }
 
-int raw_sock_no_ioctlcmd(struct socket *sock, unsigned int cmd,
-                         unsigned long arg)
+static int raw_sock_no_ioctlcmd(struct socket *sock, unsigned int cmd,
+                                unsigned long arg)
 {
         /* no ioctls for socket layer -> hand it down to NIC layer */
         return -ENOIOCTLCMD;
@@ -887,7 +885,7 @@ static __init int raw_module_init(void)
 
         err = can_proto_register(&raw_can_proto);
         if (err < 0)
-                printk(KERN_ERR "can: registration of raw protocol failed\n");
+                pr_err("can: registration of raw protocol failed\n");
 
         return err;
 }