drm/mediatek: mtk_dpi: Switch to .remove_new() void callback

AngeloGioacchino Del Regno · Chun-Kuang Hu · commit 90c95c3892dd · 2023-08-09T23:00:18.000Z
The .remove() callback cannot fail: switch to .remove_new() and change mtk_dpi_remove() to void. Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Reviewed-by: Fei Shao <fshao@chromium.org> Reviewed-by: CK Hu <ck.hu@mediatek.com> Link: https://patchwork.kernel.org/project/dri-devel/patch/20230726082245.550929-5-angelogioacchino.delregno@collabora.com/ Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c
@@ -1087,11 +1087,9 @@ static int mtk_dpi_probe(struct platform_device *pdev)
 	return 0;
 }
 
-static int mtk_dpi_remove(struct platform_device *pdev)
+static void mtk_dpi_remove(struct platform_device *pdev)
 {
 	component_del(&pdev->dev, &mtk_dpi_component_ops);
-
-	return 0;
 }
 
 static const struct of_device_id mtk_dpi_of_ids[] = {
@@ -1122,7 +1120,7 @@ MODULE_DEVICE_TABLE(of, mtk_dpi_of_ids);
 
 struct platform_driver mtk_dpi_driver = {
 	.probe = mtk_dpi_probe,
-	.remove = mtk_dpi_remove,
+	.remove_new = mtk_dpi_remove,
 	.driver = {
 		.name = "mediatek-dpi",
 		.of_match_table = mtk_dpi_of_ids,

Original file line number	Diff line number	Diff line change
`@@ -1087,11 +1087,9 @@ static int mtk_dpi_probe(struct platform_device *pdev)`
`1087`	`1087`	`return 0;`
`1088`	`1088`	`}`
`1089`	`1089`
`1090`		`-static int mtk_dpi_remove(struct platform_device *pdev)`
	`1090`	`+static void mtk_dpi_remove(struct platform_device *pdev)`
`1091`	`1091`	`{`
`1092`	`1092`	`component_del(&pdev->dev, &mtk_dpi_component_ops);`
`1093`		`-`
`1094`		`- return 0;`
`1095`	`1093`	`}`
`1096`	`1094`
`1097`	`1095`	`static const struct of_device_id mtk_dpi_of_ids[] = {`
`@@ -1122,7 +1120,7 @@ MODULE_DEVICE_TABLE(of, mtk_dpi_of_ids);`
`1122`	`1120`
`1123`	`1121`	`struct platform_driver mtk_dpi_driver = {`
`1124`	`1122`	`.probe = mtk_dpi_probe,`
`1125`		`- .remove = mtk_dpi_remove,`
	`1123`	`+ .remove_new = mtk_dpi_remove,`
`1126`	`1124`	`.driver = {`
`1127`	`1125`	`.name = "mediatek-dpi",`
`1128`	`1126`	`.of_match_table = mtk_dpi_of_ids,`