drm/msm/mdp5: use devres-managed allocation for SMP data

Use devm_kzalloc to create SMP data structure. This allows us
to remove corresponding kfree and drop mdp5_smp_destroy() function.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
Patchwork: https://patchwork.freedesktop.org/patch/546172/
Link: https://lore.kernel.org/r/20230708010407.3871346-7-dmitry.baryshkov@linaro.org

diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
index b918c9dc0afb64c1e17f48689db4b1dbfb6e27df..4cfb1a8e903ed0a10e3154d693086150890ebd42 100644 (file)
--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
+++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c
@@ -618,9 +618,6 @@ static void mdp5_destroy(struct mdp5_kms *mdp5_kms)
 {
        int i;
 
-       if (mdp5_kms->smp)
-               mdp5_smp_destroy(mdp5_kms->smp);
-
        for (i = 0; i < mdp5_kms->num_intfs; i++)
                kfree(mdp5_kms->intfs[i]);
 

diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c
index b68682c1b5bcfaf1500b3bb8b245b2c0539a45f8..8b59562e29e2846c87a69f248608d1d998411834 100644 (file)
--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c
+++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c
@@ -370,23 +370,17 @@ void mdp5_smp_dump(struct mdp5_smp *smp, struct drm_printer *p)
                drm_modeset_unlock(&mdp5_kms->glob_state_lock);
 }
 
-void mdp5_smp_destroy(struct mdp5_smp *smp)
-{
-       kfree(smp);
-}
 
 struct mdp5_smp *mdp5_smp_init(struct mdp5_kms *mdp5_kms, const struct mdp5_smp_block *cfg)
 {
+       struct drm_device *dev = mdp5_kms->dev;
        struct mdp5_smp_state *state;
        struct mdp5_global_state *global_state;
        struct mdp5_smp *smp;
-       int ret;
 
-       smp = kzalloc(sizeof(*smp), GFP_KERNEL);
-       if (unlikely(!smp)) {
-               ret = -ENOMEM;
-               goto fail;
-       }
+       smp = devm_kzalloc(dev->dev, sizeof(*smp), GFP_KERNEL);
+       if (unlikely(!smp))
+               return ERR_PTR(-ENOMEM);
 
        smp->dev = mdp5_kms->dev;
        smp->blk_cnt = cfg->mmb_count;
@@ -400,9 +394,4 @@ struct mdp5_smp *mdp5_smp_init(struct mdp5_kms *mdp5_kms, const struct mdp5_smp_
        memcpy(smp->reserved, cfg->reserved, sizeof(smp->reserved));
 
        return smp;
-fail:
-       if (smp)
-               mdp5_smp_destroy(smp);
-
-       return ERR_PTR(ret);
 }

diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.h b/drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.h
index ba5618e136c3d8da097acde090a31ea72022752f..d8b6a11413d9315e5c5476c3e3df6e4b7e27cf3c 100644 (file)
--- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.h
+++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.h
@@ -68,7 +68,6 @@ struct mdp5_smp;
 
 struct mdp5_smp *mdp5_smp_init(struct mdp5_kms *mdp5_kms,
                const struct mdp5_smp_block *cfg);
-void  mdp5_smp_destroy(struct mdp5_smp *smp);
 
 void mdp5_smp_dump(struct mdp5_smp *smp, struct drm_printer *p);