Merge tag 'mediatek-drm-next-6.6' of https://git.kernel.org/pub/scm/linux/kernel...

[J-linux.git] / drivers / gpu / drm / mediatek / mtk_mdp_rdma.c

diff --git a/drivers/gpu/drm/mediatek/mtk_mdp_rdma.c b/drivers/gpu/drm/mediatek/mtk_mdp_rdma.c
index 4806bdd4b8fa13fa54fa7964866eb036be2703af..c3adaeefd551a269c788e81ce89e19103912b0c9 100644 (file)
--- a/drivers/gpu/drm/mediatek/mtk_mdp_rdma.c
+++ b/drivers/gpu/drm/mediatek/mtk_mdp_rdma.c
@@ -314,11 +314,10 @@ static int mtk_mdp_rdma_probe(struct platform_device *pdev)
        return ret;
 }
 
-static int mtk_mdp_rdma_remove(struct platform_device *pdev)
+static void mtk_mdp_rdma_remove(struct platform_device *pdev)
 {
        component_del(&pdev->dev, &mtk_mdp_rdma_component_ops);
        pm_runtime_disable(&pdev->dev);
-       return 0;
 }
 
 static const struct of_device_id mtk_mdp_rdma_driver_dt_match[] = {
@@ -329,7 +328,7 @@ MODULE_DEVICE_TABLE(of, mtk_mdp_rdma_driver_dt_match);
 
 struct platform_driver mtk_mdp_rdma_driver = {
        .probe = mtk_mdp_rdma_probe,
-       .remove = mtk_mdp_rdma_remove,
+       .remove_new = mtk_mdp_rdma_remove,
        .driver = {
                .name = "mediatek-mdp-rdma",
                .owner = THIS_MODULE,