Commit f23f0e63 authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Hans Verkuil

media: jpeg-core: 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 (mostly) ignored
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.

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>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
parent 63a99bed
...@@ -2991,7 +2991,7 @@ static int s5p_jpeg_probe(struct platform_device *pdev) ...@@ -2991,7 +2991,7 @@ static int s5p_jpeg_probe(struct platform_device *pdev)
return ret; return ret;
} }
static int s5p_jpeg_remove(struct platform_device *pdev) static void s5p_jpeg_remove(struct platform_device *pdev)
{ {
struct s5p_jpeg *jpeg = platform_get_drvdata(pdev); struct s5p_jpeg *jpeg = platform_get_drvdata(pdev);
int i; int i;
...@@ -3008,8 +3008,6 @@ static int s5p_jpeg_remove(struct platform_device *pdev) ...@@ -3008,8 +3008,6 @@ static int s5p_jpeg_remove(struct platform_device *pdev)
for (i = jpeg->variant->num_clocks - 1; i >= 0; i--) for (i = jpeg->variant->num_clocks - 1; i >= 0; i--)
clk_disable_unprepare(jpeg->clocks[i]); clk_disable_unprepare(jpeg->clocks[i]);
} }
return 0;
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
...@@ -3164,7 +3162,7 @@ static void *jpeg_get_drv_data(struct device *dev) ...@@ -3164,7 +3162,7 @@ static void *jpeg_get_drv_data(struct device *dev)
static struct platform_driver s5p_jpeg_driver = { static struct platform_driver s5p_jpeg_driver = {
.probe = s5p_jpeg_probe, .probe = s5p_jpeg_probe,
.remove = s5p_jpeg_remove, .remove_new = s5p_jpeg_remove,
.driver = { .driver = {
.of_match_table = of_match_ptr(samsung_jpeg_match), .of_match_table = of_match_ptr(samsung_jpeg_match),
.name = S5P_JPEG_M2M_NAME, .name = S5P_JPEG_M2M_NAME,
......
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