mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-30 14:19:16 +00:00
Code Issues Releases Wiki Activity

net: ethernet: via: Convert to platform remove callback returning void

Browse source 
The .remove() callback for a platform driver returns an int which makes
many driver authors wrongly assume it's possible to do error handling by
returning an error code. However the value returned is ignored (apart
from emitting a warning) and this typically results in resource leaks.
To improve here there is a quest to make the remove callback return
void. In the first step of this quest all drivers are converted to
.remove_new() which already returns void. Eventually after all drivers
are converted, .remove_new() is renamed to .remove().

Trivially convert these drivers from always returning zero in the remove
callback to the void returning variant.

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 2023-09-18 22:42:23 +02:00 committed by David S. Miller
parent 2f961952e1
commit 70680f1782
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/net/ethernet/via/via-rhine.c
View file

@ -2443,7 +2443,7 @@ static void rhine_remove_one_pci(struct pci_dev *pdev)
pci_disable_device(pdev); pci_disable_device(pdev);
} }
static int rhine_remove_one_platform(struct platform_device *pdev) static void rhine_remove_one_platform(struct platform_device *pdev)
{ {
struct net_device *dev = platform_get_drvdata(pdev); struct net_device *dev = platform_get_drvdata(pdev);
struct rhine_private *rp = netdev_priv(dev); struct rhine_private *rp = netdev_priv(dev);
@ -2453,8 +2453,6 @@ static int rhine_remove_one_platform(struct platform_device *pdev)
iounmap(rp->base); iounmap(rp->base);
free_netdev(dev); free_netdev(dev);
return 0;
} }
static void rhine_shutdown_pci(struct pci_dev *pdev) static void rhine_shutdown_pci(struct pci_dev *pdev)
@ -2572,7 +2570,7 @@ static struct pci_driver rhine_driver_pci = {
static struct platform_driver rhine_driver_platform = { static struct platform_driver rhine_driver_platform = {
.probe = rhine_init_one_platform, .probe = rhine_init_one_platform,
.remove = rhine_remove_one_platform, .remove_new = rhine_remove_one_platform,
.driver = { .driver = {
.name = DRV_NAME, .name = DRV_NAME,
.of_match_table = rhine_of_tbl, .of_match_table = rhine_of_tbl,

6
drivers/net/ethernet/via/via-velocity.c
View file

@ -2957,11 +2957,9 @@ static int velocity_platform_probe(struct platform_device *pdev)
return velocity_probe(&pdev->dev, irq, info, BUS_PLATFORM); return velocity_probe(&pdev->dev, irq, info, BUS_PLATFORM);
} }
static int velocity_platform_remove(struct platform_device *pdev) static void velocity_platform_remove(struct platform_device *pdev)
{ {
velocity_remove(&pdev->dev); velocity_remove(&pdev->dev);
return 0;
} }
#ifdef CONFIG_PM_SLEEP #ifdef CONFIG_PM_SLEEP
@ -3249,7 +3247,7 @@ static struct pci_driver velocity_pci_driver = {
static struct platform_driver velocity_platform_driver = { static struct platform_driver velocity_platform_driver = {
.probe = velocity_platform_probe, .probe = velocity_platform_probe,
.remove = velocity_platform_remove, .remove_new = velocity_platform_remove,
.driver = { .driver = {
.name = "via-velocity", .name = "via-velocity",
.of_match_table = velocity_of_ids, .of_match_table = velocity_of_ids,