Skip to content

Commit e81a321

Browse files
Uwe Kleine-Königandreas-gaisler
authored andcommitted
sbus: flash: 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> Reviewed-by: Andreas Larsson <andreas@gaisler.com> Signed-off-by: Andreas Larsson <andreas@gaisler.com> Link: https://lore.kernel.org/r/a9c6351fc24c40d011697cd7540950f412507965.1709591118.git.u.kleine-koenig@pengutronix.de
1 parent 09c531e commit e81a321

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

drivers/sbus/char/flash.c

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,11 +187,9 @@ static int flash_probe(struct platform_device *op)
187187
return misc_register(&flash_dev);
188188
}
189189

190-
static int flash_remove(struct platform_device *op)
190+
static void flash_remove(struct platform_device *op)
191191
{
192192
misc_deregister(&flash_dev);
193-
194-
return 0;
195193
}
196194

197195
static const struct of_device_id flash_match[] = {
@@ -208,7 +206,7 @@ static struct platform_driver flash_driver = {
208206
.of_match_table = flash_match,
209207
},
210208
.probe = flash_probe,
211-
.remove = flash_remove,
209+
.remove_new = flash_remove,
212210
};
213211

214212
module_platform_driver(flash_driver);

0 commit comments

Comments
 (0)