pcmcia: sa1100: 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/6473afe67fc5c320a8184d0871a8561f7685e265.1702051073.git.u.kleine-koenig@pengutronix.de Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
e5b25d20b6
commit
c1991d49bb
|
@ -158,20 +158,18 @@ static int sa11x0_drv_pcmcia_probe(struct platform_device *pdev)
|
|||
return sa11xx_drv_pcmcia_add_one(skt);
|
||||
}
|
||||
|
||||
static int sa11x0_drv_pcmcia_remove(struct platform_device *dev)
|
||||
static void sa11x0_drv_pcmcia_remove(struct platform_device *dev)
|
||||
{
|
||||
struct soc_pcmcia_socket *skt;
|
||||
|
||||
if (dev->id == -1) {
|
||||
sa11x0_drv_pcmcia_legacy_remove(dev);
|
||||
return 0;
|
||||
return;
|
||||
}
|
||||
|
||||
skt = platform_get_drvdata(dev);
|
||||
|
||||
soc_pcmcia_remove_one(skt);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct platform_driver sa11x0_pcmcia_driver = {
|
||||
|
@ -179,7 +177,7 @@ static struct platform_driver sa11x0_pcmcia_driver = {
|
|||
.name = "sa11x0-pcmcia",
|
||||
},
|
||||
.probe = sa11x0_drv_pcmcia_probe,
|
||||
.remove = sa11x0_drv_pcmcia_remove,
|
||||
.remove_new = sa11x0_drv_pcmcia_remove,
|
||||
};
|
||||
|
||||
/* sa11x0_pcmcia_init()
|
||||
|
|
Loading…
Reference in New Issue