]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
arm: mali-dp: Extract mode_config cleanup into malidp_fini
authorBrian Starkey <brian.starkey@arm.com>
Tue, 11 Oct 2016 14:26:06 +0000 (15:26 +0100)
committerLiviu Dudau <Liviu.Dudau@arm.com>
Fri, 4 Nov 2016 17:09:00 +0000 (17:09 +0000)
Split out malidp_fini as the opposite of malidp_init. This helps keep
the cleanup paths neat and easier to manage.

Signed-off-by: Brian Starkey <brian.starkey@arm.com>
Signed-off-by: Liviu Dudau <Liviu.Dudau@arm.com>
drivers/gpu/drm/arm/malidp_drv.c

index 9468dfd52336bf9644dac4b24724152125a17e55..9bd6b072a405aa847302ac721578f668498be4ef 100644 (file)
@@ -156,6 +156,12 @@ static int malidp_init(struct drm_device *drm)
        return 0;
 }
 
+static void malidp_fini(struct drm_device *drm)
+{
+       malidp_de_planes_destroy(drm);
+       drm_mode_config_cleanup(drm);
+}
+
 static int malidp_irq_init(struct platform_device *pdev)
 {
        int irq_de, irq_se, ret = 0;
@@ -414,8 +420,7 @@ bind_fail:
 port_fail:
        drm_dev_unregister(drm);
 register_fail:
-       malidp_de_planes_destroy(drm);
-       drm_mode_config_cleanup(drm);
+       malidp_fini(drm);
 init_fail:
        drm->dev_private = NULL;
        dev_set_drvdata(dev, NULL);
@@ -448,8 +453,7 @@ static void malidp_unbind(struct device *dev)
        of_node_put(malidp->crtc.port);
        malidp->crtc.port = NULL;
        drm_dev_unregister(drm);
-       malidp_de_planes_destroy(drm);
-       drm_mode_config_cleanup(drm);
+       malidp_fini(drm);
        drm->dev_private = NULL;
        dev_set_drvdata(dev, NULL);
        clk_disable_unprepare(hwdev->mclk);