Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 79d891c1 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'linux-can-next-for-4.16-20180105' of... 

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



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: default avatarDavid S. Miller <davem@davemloft.net>
parents 5138eb9b ff847ee4

drivers/net/can/rx-offload.c

+1 −1
Original line number Diff line number Diff line
@@ -256,7 +256,7 @@ int can_rx_offload_add_timestamp(struct net_device *dev, struct can_rx_offload * 
		weight = offload->mb_first - offload->mb_last;

	}



	return can_rx_offload_init_queue(dev, offload, weight);;

	return can_rx_offload_init_queue(dev, offload, weight);

}

EXPORT_SYMBOL_GPL(can_rx_offload_add_timestamp);

drivers/net/can/slcan.c

+2 −2
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ static void slc_sync(void) 
}



/* Find a free SLCAN channel, and link in this `tty' line. */

static struct slcan *slc_alloc(dev_t line)

static struct slcan *slc_alloc(void)

{

	int i;

	char name[IFNAMSIZ];
@@ -583,7 +583,7 @@ static int slcan_open(struct tty_struct *tty) 


	/* OK.  Find a free SLCAN channel to use. */

	err = -ENFILE;

	sl = slc_alloc(tty_devnum(tty));

	sl = slc_alloc();

	if (sl == NULL)

		goto err_exit;

drivers/net/can/spi/mcp251x.c

+3 −4
Original line number Diff line number Diff line
@@ -612,8 +612,7 @@ static int mcp251x_do_set_bittiming(struct net_device *net) 
	return 0;

}



static int mcp251x_setup(struct net_device *net, struct mcp251x_priv *priv,

			 struct spi_device *spi)

static int mcp251x_setup(struct net_device *net, struct spi_device *spi)

{

	mcp251x_do_set_bittiming(net);
@@ -775,7 +774,7 @@ static void mcp251x_restart_work_handler(struct work_struct *ws) 
	mutex_lock(&priv->mcp_lock);

	if (priv->after_suspend) {

		mcp251x_hw_reset(spi);

		mcp251x_setup(net, priv, spi);

		mcp251x_setup(net, spi);

		if (priv->after_suspend & AFTER_SUSPEND_RESTART) {

			mcp251x_set_normal_mode(spi);

		} else if (priv->after_suspend & AFTER_SUSPEND_UP) {
@@ -971,7 +970,7 @@ static int mcp251x_open(struct net_device *net) 
		mcp251x_open_clean(net);

		goto open_unlock;

	}

	ret = mcp251x_setup(net, priv, spi);

	ret = mcp251x_setup(net, spi);

	if (ret) {

		mcp251x_open_clean(net);

		goto open_unlock;

drivers/net/can/usb/gs_usb.c

+2 −2
Original line number Diff line number Diff line
@@ -243,7 +243,7 @@ static struct gs_tx_context *gs_get_tx_context(struct gs_can *dev, 
	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;
@@ -709,7 +709,7 @@ static int gs_can_close(struct net_device *netdev) 
	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);

drivers/net/can/usb/peak_usb/pcan_usb_core.c

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ void peak_usb_get_ts_time(struct peak_time_ref *time_ref, u32 ts, ktime_t *time) 
 * post received skb after having set any hw timestamp

 */

int peak_usb_netif_rx(struct sk_buff *skb,

		      struct peak_time_ref *time_ref, u32 ts_low, u32 ts_high)

		      struct peak_time_ref *time_ref, u32 ts_low)

{

	struct skb_shared_hwtstamps *hwts = skb_hwtstamps(skb);