Skip to content

Commit 5d9e129

Browse files
Uwe Kleine-Königandy-shev
authored andcommitted
auxdisplay: img-ascii-lcd: 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 <[email protected]> Reviewed-by: Geert Uytterhoeven <[email protected]> Signed-off-by: Andy Shevchenko <[email protected]>
1 parent 9ea02f7 commit 5d9e129

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

drivers/auxdisplay/img-ascii-lcd.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -276,16 +276,13 @@ static int img_ascii_lcd_probe(struct platform_device *pdev)
276276
*
277277
* Remove an LCD display device, freeing private resources & ensuring that the
278278
* driver stops using the LCD display registers.
279-
*
280-
* Return: 0
281279
*/
282-
static int img_ascii_lcd_remove(struct platform_device *pdev)
280+
static void img_ascii_lcd_remove(struct platform_device *pdev)
283281
{
284282
struct img_ascii_lcd_ctx *ctx = platform_get_drvdata(pdev);
285283

286284
sysfs_remove_link(&pdev->dev.kobj, "message");
287285
linedisp_unregister(&ctx->linedisp);
288-
return 0;
289286
}
290287

291288
static struct platform_driver img_ascii_lcd_driver = {
@@ -294,7 +291,7 @@ static struct platform_driver img_ascii_lcd_driver = {
294291
.of_match_table = img_ascii_lcd_matches,
295292
},
296293
.probe = img_ascii_lcd_probe,
297-
.remove = img_ascii_lcd_remove,
294+
.remove_new = img_ascii_lcd_remove,
298295
};
299296
module_platform_driver(img_ascii_lcd_driver);
300297

0 commit comments

Comments
 (0)