Skip to content

Commit ce322d4

Browse files
Uwe Kleine-Königdavem330
authored andcommitted
net: dsa: vitesse-vsc73xx: Convert to platform remove callback returning void
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 this driver 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> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Reviewed-by: Florian Fainelli <florian.fainelli@broadcom.com> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 76be075 commit ce322d4

1 file changed

Lines changed: 3 additions & 5 deletions

File tree

drivers/net/dsa/vitesse-vsc73xx-platform.c

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,16 +112,14 @@ static int vsc73xx_platform_probe(struct platform_device *pdev)
112112
return vsc73xx_probe(&vsc_platform->vsc);
113113
}
114114

115-
static int vsc73xx_platform_remove(struct platform_device *pdev)
115+
static void vsc73xx_platform_remove(struct platform_device *pdev)
116116
{
117117
struct vsc73xx_platform *vsc_platform = platform_get_drvdata(pdev);
118118

119119
if (!vsc_platform)
120-
return 0;
120+
return;
121121

122122
vsc73xx_remove(&vsc_platform->vsc);
123-
124-
return 0;
125123
}
126124

127125
static void vsc73xx_platform_shutdown(struct platform_device *pdev)
@@ -160,7 +158,7 @@ MODULE_DEVICE_TABLE(of, vsc73xx_of_match);
160158

161159
static struct platform_driver vsc73xx_platform_driver = {
162160
.probe = vsc73xx_platform_probe,
163-
.remove = vsc73xx_platform_remove,
161+
.remove_new = vsc73xx_platform_remove,
164162
.shutdown = vsc73xx_platform_shutdown,
165163
.driver = {
166164
.name = "vsc73xx-platform",

0 commit comments

Comments
 (0)