UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: w5100: Make w5100_remove() return void 

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>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Uwe Kleine-König 2021-10-15 08:56:15 +02:00 committed by David S. Miller
parent 2841bfd10a
commit d40dfa0ceb
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/ethernet/wiznet/w5100-spi.c
View File

@ -463,7 +463,9 @@ static int w5100_spi_probe(struct spi_device *spi)
static int w5100_spi_remove(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[] = { static const struct spi_device_id w5100_spi_ids[] = {

7
drivers/net/ethernet/wiznet/w5100.c
View File

@ -1064,7 +1064,9 @@ static int w5100_mmio_probe(struct platform_device *pdev)
static int w5100_mmio_remove(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) void *w5100_ops_priv(const struct net_device *ndev)
@ -1210,7 +1212,7 @@ err_register:
} }
EXPORT_SYMBOL_GPL(w5100_probe); 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 net_device *ndev = dev_get_drvdata(dev);
struct w5100_priv *priv = netdev_priv(ndev); struct w5100_priv *priv = netdev_priv(ndev);
@ -1226,7 +1228,6 @@ int w5100_remove(struct device *dev)
unregister_netdev(ndev); unregister_netdev(ndev);
free_netdev(ndev); free_netdev(ndev);
return 0;
} }
EXPORT_SYMBOL_GPL(w5100_remove); EXPORT_SYMBOL_GPL(w5100_remove);

2
drivers/net/ethernet/wiznet/w5100.h
View File

@ -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 w5100_probe(struct device *dev, const struct w5100_ops *ops,
int sizeof_ops_priv, const void *mac_addr, int irq, int sizeof_ops_priv, const void *mac_addr, int irq,
int link_gpio); int link_gpio);
int w5100_remove(struct device *dev); void w5100_remove(struct device *dev);
extern const struct dev_pm_ops w5100_pm_ops; extern const struct dev_pm_ops w5100_pm_ops;