Skip to content

Commit d8d6608

Browse files
Uwe Kleine-Königaxboe
authored andcommitted
block/swim: 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/a00aea8201ea85ae726411bb0fb015ea026ff40a.1709886922.git.u.kleine-koenig@pengutronix.de Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 0dc31b9 commit d8d6608

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/block/swim.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -916,7 +916,7 @@ static int swim_probe(struct platform_device *dev)
916916
return ret;
917917
}
918918

919-
static int swim_remove(struct platform_device *dev)
919+
static void swim_remove(struct platform_device *dev)
920920
{
921921
struct swim_priv *swd = platform_get_drvdata(dev);
922922
int drive;
@@ -937,13 +937,11 @@ static int swim_remove(struct platform_device *dev)
937937
release_mem_region(res->start, resource_size(res));
938938

939939
kfree(swd);
940-
941-
return 0;
942940
}
943941

944942
static struct platform_driver swim_driver = {
945943
.probe = swim_probe,
946-
.remove = swim_remove,
944+
.remove_new = swim_remove,
947945
.driver = {
948946
.name = CARDNAME,
949947
},

0 commit comments

Comments
 (0)