Merge tag 'drm-etnaviv-next-2024-03-07' of https://git.pengutronix.de/git/lst/linux...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / etnaviv / etnaviv_drv.c

diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
index 491da486c4e53805671b3eede854c78ffef114a9..6500f3999c5fa5e40d8125939f649d73f0c5e2b5 100644 (file)
--- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
@@ -651,16 +651,14 @@ static int etnaviv_pdev_probe(struct platform_device *pdev)
        return component_master_add_with_match(dev, &etnaviv_master_ops, match);
 }
 
-static int etnaviv_pdev_remove(struct platform_device *pdev)
+static void etnaviv_pdev_remove(struct platform_device *pdev)
 {
        component_master_del(&pdev->dev, &etnaviv_master_ops);
-
-       return 0;
 }
 
 static struct platform_driver etnaviv_platform_driver = {
        .probe      = etnaviv_pdev_probe,
-       .remove     = etnaviv_pdev_remove,
+       .remove_new = etnaviv_pdev_remove,
        .driver     = {
                .name   = "etnaviv",
        },