Commit 5d9e1297 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Andy Shevchenko

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: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Reviewed-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
parent 9ea02f7c
...@@ -276,16 +276,13 @@ static int img_ascii_lcd_probe(struct platform_device *pdev) ...@@ -276,16 +276,13 @@ static int img_ascii_lcd_probe(struct platform_device *pdev)
* *
* Remove an LCD display device, freeing private resources & ensuring that the * Remove an LCD display device, freeing private resources & ensuring that the
* driver stops using the LCD display registers. * driver stops using the LCD display registers.
*
* Return: 0
*/ */
static int img_ascii_lcd_remove(struct platform_device *pdev) static void img_ascii_lcd_remove(struct platform_device *pdev)
{ {
struct img_ascii_lcd_ctx *ctx = platform_get_drvdata(pdev); struct img_ascii_lcd_ctx *ctx = platform_get_drvdata(pdev);
sysfs_remove_link(&pdev->dev.kobj, "message"); sysfs_remove_link(&pdev->dev.kobj, "message");
linedisp_unregister(&ctx->linedisp); linedisp_unregister(&ctx->linedisp);
return 0;
} }
static struct platform_driver img_ascii_lcd_driver = { static struct platform_driver img_ascii_lcd_driver = {
...@@ -294,7 +291,7 @@ static struct platform_driver img_ascii_lcd_driver = { ...@@ -294,7 +291,7 @@ static struct platform_driver img_ascii_lcd_driver = {
.of_match_table = img_ascii_lcd_matches, .of_match_table = img_ascii_lcd_matches,
}, },
.probe = img_ascii_lcd_probe, .probe = img_ascii_lcd_probe,
.remove = img_ascii_lcd_remove, .remove_new = img_ascii_lcd_remove,
}; };
module_platform_driver(img_ascii_lcd_driver); module_platform_driver(img_ascii_lcd_driver);
......
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