diff options
author | David S. Miller <davem@davemloft.net> | 2018-01-15 16:13:34 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-01-15 16:13:34 -0500 |
commit | 79d891c1bbb6573cef31dbc2030fba61cfa1df6d (patch) | |
tree | 35a384bd5584a217ae63d33020879afb6a076713 /drivers/net/can/spi/mcp251x.c | |
parent | 5138eb9b2a744f780194b292bffd8638c7a6d423 (diff) | |
parent | ff847ee47be27621f978921919f035fcd87d6d08 (diff) | |
download | linux-stable-79d891c1bbb6573cef31dbc2030fba61cfa1df6d.tar.gz linux-stable-79d891c1bbb6573cef31dbc2030fba61cfa1df6d.tar.bz2 linux-stable-79d891c1bbb6573cef31dbc2030fba61cfa1df6d.zip |
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: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/can/spi/mcp251x.c')
-rw-r--r-- | drivers/net/can/spi/mcp251x.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/net/can/spi/mcp251x.c b/drivers/net/can/spi/mcp251x.c index f3f05fea8e1f..98d118b3aaf4 100644 --- a/drivers/net/can/spi/mcp251x.c +++ b/drivers/net/can/spi/mcp251x.c @@ -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; |