* [PATCH v2 0/2 net-next] Let spi drivers return 0 in .remove()
@ 2021-10-15 6:56 Uwe Kleine-König
2021-10-15 6:56 ` [PATCH v2 1/2] net: ks8851: Make ks8851_remove_common() return void Uwe Kleine-König
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Uwe Kleine-König @ 2021-10-15 6:56 UTC (permalink / raw)
To: David S. Miller, Jakub Kicinski
Cc: Andrew Lunn, Arnd Bergmann, Marek Vasut, Mark Brown,
Michael Walle, Nathan Chancellor, Tom Rix, Yang Yingliang,
Zheng Yongjun, kernel, linux-spi, netdev
Hello,
this series is part of my quest to change the return type of the spi
driver .remove() callback to void. In this first stage I fix all drivers
to return 0 to be able to mechanically change all drivers in the final
step. Here the two spi drivers in net are fixed to obviously return 0.
Returning an error code (which actually very few drivers do) doesn't
make much sense, because the only effect is that the spi core emits an
error message.
The same holds try for platform drivers, one of them is fixed en passant.
There is no need to coordinate application of this series. There is
still much to do until struct spi_driver can be changed.
Changes since v1:
- Fix a compile error found by the kernel test robot, thanks!
Best regards
Uwe
Uwe Kleine-König (2):
net: ks8851: Make ks8851_remove_common() return void
net: w5100: Make w5100_remove() return void
drivers/net/ethernet/micrel/ks8851.h | 2 +-
drivers/net/ethernet/micrel/ks8851_common.c | 4 +---
drivers/net/ethernet/micrel/ks8851_par.c | 4 +++-
drivers/net/ethernet/micrel/ks8851_spi.c | 4 +++-
drivers/net/ethernet/wiznet/w5100-spi.c | 4 +++-
drivers/net/ethernet/wiznet/w5100.c | 7 ++++---
drivers/net/ethernet/wiznet/w5100.h | 2 +-
7 files changed, 16 insertions(+), 11 deletions(-)
base-commit: 9e1ff307c779ce1f0f810c7ecce3d95bbae40896
--
2.30.2
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2 1/2] net: ks8851: Make ks8851_remove_common() return void
2021-10-15 6:56 [PATCH v2 0/2 net-next] Let spi drivers return 0 in .remove() Uwe Kleine-König
@ 2021-10-15 6:56 ` Uwe Kleine-König
2021-10-15 6:56 ` [PATCH v2 2/2] net: w5100: Make w5100_remove() " Uwe Kleine-König
2021-10-18 12:10 ` [PATCH v2 0/2 net-next] Let spi drivers return 0 in .remove() patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Uwe Kleine-König @ 2021-10-15 6:56 UTC (permalink / raw)
To: David S. Miller, Jakub Kicinski
Cc: Andrew Lunn, Arnd Bergmann, Marek Vasut, Mark Brown,
Michael Walle, Nathan Chancellor, Tom Rix, Zheng Yongjun, kernel,
linux-spi, netdev
Up to now ks8851_remove_common() returns zero unconditionally. Make it
return void instead which makes it easier to see in the callers that
there is no error to handle.
Also the return value of platform and spi remove callbacks is ignored
anyway.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
drivers/net/ethernet/micrel/ks8851.h | 2 +-
drivers/net/ethernet/micrel/ks8851_common.c | 4 +---
drivers/net/ethernet/micrel/ks8851_par.c | 4 +++-
drivers/net/ethernet/micrel/ks8851_spi.c | 4 +++-
4 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/micrel/ks8851.h b/drivers/net/ethernet/micrel/ks8851.h
index e2eb0caeac82..6f34a61739b6 100644
--- a/drivers/net/ethernet/micrel/ks8851.h
+++ b/drivers/net/ethernet/micrel/ks8851.h
@@ -427,7 +427,7 @@ struct ks8851_net {
int ks8851_probe_common(struct net_device *netdev, struct device *dev,
int msg_en);
-int ks8851_remove_common(struct device *dev);
+void ks8851_remove_common(struct device *dev);
int ks8851_suspend(struct device *dev);
int ks8851_resume(struct device *dev);
diff --git a/drivers/net/ethernet/micrel/ks8851_common.c b/drivers/net/ethernet/micrel/ks8851_common.c
index a6db1a8156e1..77f3d2f820fb 100644
--- a/drivers/net/ethernet/micrel/ks8851_common.c
+++ b/drivers/net/ethernet/micrel/ks8851_common.c
@@ -1247,7 +1247,7 @@ int ks8851_probe_common(struct net_device *netdev, struct device *dev,
}
EXPORT_SYMBOL_GPL(ks8851_probe_common);
-int ks8851_remove_common(struct device *dev)
+void ks8851_remove_common(struct device *dev)
{
struct ks8851_net *priv = dev_get_drvdata(dev);
@@ -1261,8 +1261,6 @@ int ks8851_remove_common(struct device *dev)
gpio_set_value(priv->gpio, 0);
regulator_disable(priv->vdd_reg);
regulator_disable(priv->vdd_io);
-
- return 0;
}
EXPORT_SYMBOL_GPL(ks8851_remove_common);
diff --git a/drivers/net/ethernet/micrel/ks8851_par.c b/drivers/net/ethernet/micrel/ks8851_par.c
index 2e8fcce50f9d..2e25798c610e 100644
--- a/drivers/net/ethernet/micrel/ks8851_par.c
+++ b/drivers/net/ethernet/micrel/ks8851_par.c
@@ -327,7 +327,9 @@ static int ks8851_probe_par(struct platform_device *pdev)
static int ks8851_remove_par(struct platform_device *pdev)
{
- return ks8851_remove_common(&pdev->dev);
+ ks8851_remove_common(&pdev->dev);
+
+ return 0;
}
static const struct of_device_id ks8851_match_table[] = {
diff --git a/drivers/net/ethernet/micrel/ks8851_spi.c b/drivers/net/ethernet/micrel/ks8851_spi.c
index 479406ecbaa3..0303e727e99f 100644
--- a/drivers/net/ethernet/micrel/ks8851_spi.c
+++ b/drivers/net/ethernet/micrel/ks8851_spi.c
@@ -454,7 +454,9 @@ static int ks8851_probe_spi(struct spi_device *spi)
static int ks8851_remove_spi(struct spi_device *spi)
{
- return ks8851_remove_common(&spi->dev);
+ ks8851_remove_common(&spi->dev);
+
+ return 0;
}
static const struct of_device_id ks8851_match_table[] = {
--
2.30.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2 2/2] net: w5100: Make w5100_remove() return void
2021-10-15 6:56 [PATCH v2 0/2 net-next] Let spi drivers return 0 in .remove() Uwe Kleine-König
2021-10-15 6:56 ` [PATCH v2 1/2] net: ks8851: Make ks8851_remove_common() return void Uwe Kleine-König
@ 2021-10-15 6:56 ` Uwe Kleine-König
2021-10-18 12:10 ` [PATCH v2 0/2 net-next] Let spi drivers return 0 in .remove() patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: Uwe Kleine-König @ 2021-10-15 6:56 UTC (permalink / raw)
To: David S. Miller, Jakub Kicinski
Cc: Andrew Lunn, Michael Walle, Yang Yingliang, Mark Brown, kernel,
linux-spi, netdev
Up to now w5100_remove() returns zero unconditionally. Make it return
void instead which makes it easier to see in the callers that there is
no error to handle.
Also the return value of platform and spi remove callbacks is ignored
anyway.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
drivers/net/ethernet/wiznet/w5100-spi.c | 4 +++-
drivers/net/ethernet/wiznet/w5100.c | 7 ++++---
drivers/net/ethernet/wiznet/w5100.h | 2 +-
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/wiznet/w5100-spi.c b/drivers/net/ethernet/wiznet/w5100-spi.c
index 2b84848dc26a..7779a36da3c8 100644
--- a/drivers/net/ethernet/wiznet/w5100-spi.c
+++ b/drivers/net/ethernet/wiznet/w5100-spi.c
@@ -463,7 +463,9 @@ static int w5100_spi_probe(struct spi_device *spi)
static int w5100_spi_remove(struct spi_device *spi)
{
- return w5100_remove(&spi->dev);
+ w5100_remove(&spi->dev);
+
+ return 0;
}
static const struct spi_device_id w5100_spi_ids[] = {
diff --git a/drivers/net/ethernet/wiznet/w5100.c b/drivers/net/ethernet/wiznet/w5100.c
index f974e70a82e8..c49e12da0f4d 100644
--- a/drivers/net/ethernet/wiznet/w5100.c
+++ b/drivers/net/ethernet/wiznet/w5100.c
@@ -1064,7 +1064,9 @@ static int w5100_mmio_probe(struct platform_device *pdev)
static int w5100_mmio_remove(struct platform_device *pdev)
{
- return w5100_remove(&pdev->dev);
+ w5100_remove(&pdev->dev);
+
+ return 0;
}
void *w5100_ops_priv(const struct net_device *ndev)
@@ -1210,7 +1212,7 @@ int w5100_probe(struct device *dev, const struct w5100_ops *ops,
}
EXPORT_SYMBOL_GPL(w5100_probe);
-int w5100_remove(struct device *dev)
+void w5100_remove(struct device *dev)
{
struct net_device *ndev = dev_get_drvdata(dev);
struct w5100_priv *priv = netdev_priv(ndev);
@@ -1226,7 +1228,6 @@ int w5100_remove(struct device *dev)
unregister_netdev(ndev);
free_netdev(ndev);
- return 0;
}
EXPORT_SYMBOL_GPL(w5100_remove);
diff --git a/drivers/net/ethernet/wiznet/w5100.h b/drivers/net/ethernet/wiznet/w5100.h
index 5d3d4b541fec..481af3b6d9e8 100644
--- a/drivers/net/ethernet/wiznet/w5100.h
+++ b/drivers/net/ethernet/wiznet/w5100.h
@@ -31,6 +31,6 @@ void *w5100_ops_priv(const struct net_device *ndev);
int w5100_probe(struct device *dev, const struct w5100_ops *ops,
int sizeof_ops_priv, const void *mac_addr, int irq,
int link_gpio);
-int w5100_remove(struct device *dev);
+void w5100_remove(struct device *dev);
extern const struct dev_pm_ops w5100_pm_ops;
--
2.30.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2 0/2 net-next] Let spi drivers return 0 in .remove()
2021-10-15 6:56 [PATCH v2 0/2 net-next] Let spi drivers return 0 in .remove() Uwe Kleine-König
2021-10-15 6:56 ` [PATCH v2 1/2] net: ks8851: Make ks8851_remove_common() return void Uwe Kleine-König
2021-10-15 6:56 ` [PATCH v2 2/2] net: w5100: Make w5100_remove() " Uwe Kleine-König
@ 2021-10-18 12:10 ` patchwork-bot+netdevbpf
2 siblings, 0 replies; 4+ messages in thread
From: patchwork-bot+netdevbpf @ 2021-10-18 12:10 UTC (permalink / raw)
To: =?utf-8?q?Uwe_Kleine-K=C3=B6nig_=3Cu=2Ekleine-koenig=40pengutronix=2Ede=3E?=
Cc: davem, kuba, andrew, arnd, marex, broonie, michael, nathan, trix,
yangyingliang, zhengyongjun3, kernel, linux-spi, netdev
Hello:
This series was applied to netdev/net-next.git (master)
by David S. Miller <davem@davemloft.net>:
On Fri, 15 Oct 2021 08:56:13 +0200 you wrote:
> Hello,
>
> this series is part of my quest to change the return type of the spi
> driver .remove() callback to void. In this first stage I fix all drivers
> to return 0 to be able to mechanically change all drivers in the final
> step. Here the two spi drivers in net are fixed to obviously return 0.
>
> [...]
Here is the summary with links:
- [v2,1/2] net: ks8851: Make ks8851_remove_common() return void
https://git.kernel.org/netdev/net-next/c/2841bfd10aa7
- [v2,2/2] net: w5100: Make w5100_remove() return void
https://git.kernel.org/netdev/net-next/c/d40dfa0cebd8
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-10-18 12:10 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-10-15 6:56 [PATCH v2 0/2 net-next] Let spi drivers return 0 in .remove() Uwe Kleine-König
2021-10-15 6:56 ` [PATCH v2 1/2] net: ks8851: Make ks8851_remove_common() return void Uwe Kleine-König
2021-10-15 6:56 ` [PATCH v2 2/2] net: w5100: Make w5100_remove() " Uwe Kleine-König
2021-10-18 12:10 ` [PATCH v2 0/2 net-next] Let spi drivers return 0 in .remove() patchwork-bot+netdevbpf
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).