aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/dsa/sja1105/sja1105_main.c
diff options
context:
space:
mode:
authorJakub Kicinski <kuba@kernel.org>2022-02-28 10:41:31 -0800
committerJakub Kicinski <kuba@kernel.org>2022-02-28 10:43:07 -0800
commite499cd3102b280bce3a1acaf3f92e8163e53cb3b (patch)
treec842396c77adda68bce761c837d777ee7ab15e77 /drivers/net/dsa/sja1105/sja1105_main.c
parentnet: decnet: use time_is_before_jiffies() instead of open coding it (diff)
parentspi: make remove callback a void function (diff)
downloadlinux-dev-e499cd3102b280bce3a1acaf3f92e8163e53cb3b.tar.xz
linux-dev-e499cd3102b280bce3a1acaf3f92e8163e53cb3b.zip
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/dsa/sja1105/sja1105_main.c')
-rw-r--r--drivers/net/dsa/sja1105/sja1105_main.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/dsa/sja1105/sja1105_main.c b/drivers/net/dsa/sja1105/sja1105_main.c
index 380f07823cb5..3358e979342c 100644
--- a/drivers/net/dsa/sja1105/sja1105_main.c
+++ b/drivers/net/dsa/sja1105/sja1105_main.c
@@ -3344,18 +3344,16 @@ static int sja1105_probe(struct spi_device *spi)
return dsa_register_switch(priv->ds);
}
-static int sja1105_remove(struct spi_device *spi)
+static void sja1105_remove(struct spi_device *spi)
{
struct sja1105_private *priv = spi_get_drvdata(spi);
if (!priv)
- return 0;
+ return;
dsa_unregister_switch(priv->ds);
spi_set_drvdata(spi, NULL);
-
- return 0;
}
static void sja1105_shutdown(struct spi_device *spi)