drm/ingenic: Use dmam_alloc_coherent()

Use dmam_alloc_coherent() instead of dma_alloc_coherent(). Then we don't
need to register a custom cleanup handler.

v3: New patch

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200716163846.174790-8-paul@crapouillou.net

diff --git a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
index d9cd74d70a618effea63799f0f3777c3289bdd79..9cc78577659401aef9ce72791a53df69261f1449 100644 (file)
--- a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
+++ b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c
@@ -459,14 +459,6 @@ static const struct drm_mode_config_funcs ingenic_drm_mode_config_funcs = {
        .atomic_commit          = drm_atomic_helper_commit,
 };
 
-static void ingenic_drm_free_dma_hwdesc(void *d)
-{
-       struct ingenic_drm *priv = d;
-
-       dma_free_coherent(priv->dev, sizeof(*priv->dma_hwdesc),
-                         priv->dma_hwdesc, priv->dma_hwdesc_phys);
-}
-
 static int ingenic_drm_probe(struct platform_device *pdev)
 {
        const struct jz_soc_info *soc_info;
@@ -549,16 +541,12 @@ static int ingenic_drm_probe(struct platform_device *pdev)
                bridge = devm_drm_panel_bridge_add_typed(dev, panel,
                                                         DRM_MODE_CONNECTOR_DPI);
 
-       priv->dma_hwdesc = dma_alloc_coherent(dev, sizeof(*priv->dma_hwdesc),
-                                             &priv->dma_hwdesc_phys,
-                                             GFP_KERNEL);
+       priv->dma_hwdesc = dmam_alloc_coherent(dev, sizeof(*priv->dma_hwdesc),
+                                              &priv->dma_hwdesc_phys,
+                                              GFP_KERNEL);
        if (!priv->dma_hwdesc)
                return -ENOMEM;
 
-       ret = devm_add_action_or_reset(dev, ingenic_drm_free_dma_hwdesc, priv);
-       if (ret)
-               return ret;
-
        priv->dma_hwdesc->next = priv->dma_hwdesc_phys;
        priv->dma_hwdesc->id = 0xdeafbead;