Commit ed2b5f50 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Greg Kroah-Hartman

pcmcia: bcm63xx: 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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Link: https://lore.kernel.org/r/33611a4245b4dabc609a75cf0e0db5e06e9a6fc8.1702051073.git.u.kleine-koenig@pengutronix.deSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fddd9e3e
...@@ -437,7 +437,7 @@ static int bcm63xx_drv_pcmcia_probe(struct platform_device *pdev) ...@@ -437,7 +437,7 @@ static int bcm63xx_drv_pcmcia_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int bcm63xx_drv_pcmcia_remove(struct platform_device *pdev) static void bcm63xx_drv_pcmcia_remove(struct platform_device *pdev)
{ {
struct bcm63xx_pcmcia_socket *skt; struct bcm63xx_pcmcia_socket *skt;
struct resource *res; struct resource *res;
...@@ -449,12 +449,11 @@ static int bcm63xx_drv_pcmcia_remove(struct platform_device *pdev) ...@@ -449,12 +449,11 @@ static int bcm63xx_drv_pcmcia_remove(struct platform_device *pdev)
res = skt->reg_res; res = skt->reg_res;
release_mem_region(res->start, resource_size(res)); release_mem_region(res->start, resource_size(res));
kfree(skt); kfree(skt);
return 0;
} }
struct platform_driver bcm63xx_pcmcia_driver = { struct platform_driver bcm63xx_pcmcia_driver = {
.probe = bcm63xx_drv_pcmcia_probe, .probe = bcm63xx_drv_pcmcia_probe,
.remove = bcm63xx_drv_pcmcia_remove, .remove_new = bcm63xx_drv_pcmcia_remove,
.driver = { .driver = {
.name = "bcm63xx_pcmcia", .name = "bcm63xx_pcmcia",
.owner = THIS_MODULE, .owner = THIS_MODULE,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment