Merge tag 'drm-msm-fixes-2023-11-21' of https://gitlab.freedesktop.org/drm/msm into...

[sfrench/cifs-2.6.git] / drivers / gpu / drm / msm / msm_drv.c

diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index 841f9c102b28c0c63a91e6eff12e625df913a8a8..3f217b57829347413a5e570ba3441fc758e915ae 100644 (file)
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -265,7 +265,9 @@ static int msm_drm_init(struct device *dev, const struct drm_driver *drv)
        if (ret)
                goto err_deinit_vram;
 
-       msm_gem_shrinker_init(ddev);
+       ret = msm_gem_shrinker_init(ddev);
+       if (ret)
+               goto err_msm_uninit;
 
        if (priv->kms_init) {
                ret = msm_drm_kms_init(dev, drv);
@@ -973,16 +975,14 @@ static int msm_pdev_probe(struct platform_device *pdev)
        return msm_drv_probe(&pdev->dev, NULL, NULL);
 }
 
-static int msm_pdev_remove(struct platform_device *pdev)
+static void msm_pdev_remove(struct platform_device *pdev)
 {
        component_master_del(&pdev->dev, &msm_drm_ops);
-
-       return 0;
 }
 
 static struct platform_driver msm_platform_driver = {
        .probe      = msm_pdev_probe,
-       .remove     = msm_pdev_remove,
+       .remove_new = msm_pdev_remove,
        .driver     = {
                .name   = "msm",
        },