diff options
author | Jakub Kicinski <kuba@kernel.org> | 2022-02-28 21:41:31 +0300 |
---|---|---|
committer | Jakub Kicinski <kuba@kernel.org> | 2022-02-28 21:43:07 +0300 |
commit | e499cd3102b280bce3a1acaf3f92e8163e53cb3b (patch) | |
tree | c842396c77adda68bce761c837d777ee7ab15e77 /drivers/net/can/spi/mcp251xfd | |
parent | 98fffd72f934c48e7e69e21e1394de0b5aed49b4 (diff) | |
parent | a0386bba70934d42f586eaf68b21d5eeaffa7bd0 (diff) | |
download | linux-e499cd3102b280bce3a1acaf3f92e8163e53cb3b.tar.xz |
Merge tag 'spi-remove-void' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
Mark Brown says:
====================
spi: Make remove() return void
This series from Uwe Kleine-König converts the spi remove function to
return void since there is nothing useful that we can do with a failure
and it as more buses are converted it'll enable further work on the
driver core.
====================
Link: https://lore.kernel.org/r/20220228173957.1262628-2-broonie@kernel.org/
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'drivers/net/can/spi/mcp251xfd')
-rw-r--r-- | drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c index d9aaaa91109d..3da17cadbd63 100644 --- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c @@ -2120,7 +2120,7 @@ static int mcp251xfd_probe(struct spi_device *spi) return err; } -static int mcp251xfd_remove(struct spi_device *spi) +static void mcp251xfd_remove(struct spi_device *spi) { struct mcp251xfd_priv *priv = spi_get_drvdata(spi); struct net_device *ndev = priv->ndev; @@ -2129,8 +2129,6 @@ static int mcp251xfd_remove(struct spi_device *spi) mcp251xfd_unregister(priv); spi->max_speed_hz = priv->spi_max_speed_hz_orig; free_candev(ndev); - - return 0; } static int __maybe_unused mcp251xfd_runtime_suspend(struct device *device) |