mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-23 12:14:10 +08:00
pcmcia: pxa2xx: 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() will be 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> Link: https://lore.kernel.org/r/fb750d46ac80b6dfdeaa26053a2cf9d2dc875d4d.1702051073.git.u.kleine-koenig@pengutronix.de Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
560bb502ea
commit
e5b25d20b6
@ -313,15 +313,13 @@ err0:
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int pxa2xx_drv_pcmcia_remove(struct platform_device *dev)
|
||||
static void pxa2xx_drv_pcmcia_remove(struct platform_device *dev)
|
||||
{
|
||||
struct skt_dev_info *sinfo = platform_get_drvdata(dev);
|
||||
int i;
|
||||
|
||||
for (i = 0; i < sinfo->nskt; i++)
|
||||
soc_pcmcia_remove_one(&sinfo->skt[i]);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int pxa2xx_drv_pcmcia_resume(struct device *dev)
|
||||
@ -338,7 +336,7 @@ static const struct dev_pm_ops pxa2xx_drv_pcmcia_pm_ops = {
|
||||
|
||||
static struct platform_driver pxa2xx_pcmcia_driver = {
|
||||
.probe = pxa2xx_drv_pcmcia_probe,
|
||||
.remove = pxa2xx_drv_pcmcia_remove,
|
||||
.remove_new = pxa2xx_drv_pcmcia_remove,
|
||||
.driver = {
|
||||
.name = "pxa2xx-pcmcia",
|
||||
.pm = &pxa2xx_drv_pcmcia_pm_ops,
|
||||
|
Loading…
Reference in New Issue
Block a user