Merge tag 'drm-misc-next-2023-07-13' of git://anongit.freedesktop.org/drm/drm-misc...

[platform/kernel/linux-starfive.git] / drivers / gpu / drm / rockchip / rk3066_hdmi.c

diff --git a/drivers/gpu/drm/rockchip/rk3066_hdmi.c b/drivers/gpu/drm/rockchip/rk3066_hdmi.c
index b5d042e..fa6e592 100644 (file)
--- a/drivers/gpu/drm/rockchip/rk3066_hdmi.c
+++ b/drivers/gpu/drm/rockchip/rk3066_hdmi.c
@@ -858,11 +858,9 @@ static int rk3066_hdmi_probe(struct platform_device *pdev)
        return component_add(&pdev->dev, &rk3066_hdmi_ops);
 }
 
-static int rk3066_hdmi_remove(struct platform_device *pdev)
+static void rk3066_hdmi_remove(struct platform_device *pdev)
 {
        component_del(&pdev->dev, &rk3066_hdmi_ops);
-
-       return 0;
 }
 
 static const struct of_device_id rk3066_hdmi_dt_ids[] = {
@@ -873,7 +871,7 @@ MODULE_DEVICE_TABLE(of, rk3066_hdmi_dt_ids);
 
 struct platform_driver rk3066_hdmi_driver = {
        .probe  = rk3066_hdmi_probe,
-       .remove = rk3066_hdmi_remove,
+       .remove_new = rk3066_hdmi_remove,
        .driver = {
                .name = "rockchip-rk3066-hdmi",
                .of_match_table = rk3066_hdmi_dt_ids,