Merge tag 'linux-can-next-for-4.16-20180105' of ssh://gitolite.kernel.org/pub/scm...

Marc Kleine-Budde says:

====================
pull-request: can-next 2017-12-01,Re: pull-request: can-next

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

All patches are by me. Patch 6 is for the "can_raw" protocol and add
error checking to the bind() function. All other patches clean up the
coding style and remove unused parameters in various CAN drivers and
infrastructure.
====================

Signed-off-by: David S. Miller <[email protected]>

diff --combined drivers/net/can/usb/gs_usb.c
index 8bf80ad9dc44cf4622811bc1fab31404c50cfb95,a8ef3fd9eb27cdab26b4e7ac4ba216720f977438..17c21ad3b95eed15fb72342ff7d3ccedb7a2096f
--- 1/drivers/net/can/usb/gs_usb.c
--- 2/drivers/net/can/usb/gs_usb.c
+++ b/drivers/net/can/usb/gs_usb.c
@@@ -243,7 -243,7 +243,7 @@@ static struct gs_tx_context *gs_get_tx_
        return NULL;
  }
  
- static int gs_cmd_reset(struct gs_usb *gsusb, struct gs_can *gsdev)
+ static int gs_cmd_reset(struct gs_can *gsdev)
  {
        struct gs_device_mode *dm;
        struct usb_interface *intf = gsdev->iface;
@@@ -449,7 -449,7 +449,7 @@@ static int gs_usb_set_bittiming(struct 
                dev_err(netdev->dev.parent, "Couldn't set bittimings (err=%d)",
                        rc);
  
 -      return rc;
 +      return (rc > 0) ? 0 : rc;
  }
  
  static void gs_usb_xmit_callback(struct urb *urb)
@@@ -709,7 -709,7 +709,7 @@@ static int gs_can_close(struct net_devi
        atomic_set(&dev->active_tx_urbs, 0);
  
        /* reset the device */
-       rc = gs_cmd_reset(parent, dev);
+       rc = gs_cmd_reset(dev);
        if (rc < 0)
                netdev_warn(netdev, "Couldn't shutdown device (err=%d)", rc);