From: Brian Starkey <brian.starkey@arm.com>
To: dri-devel@lists.freedesktop.org
Cc: liviu.dudau@arm.com, linux-kernel@vger.kernel.org
Subject: [PATCH 5/8] arm: mali-dp: Extract mode_config cleanup into malidp_fini
Date: Tue, 11 Oct 2016 15:26:06 +0100 [thread overview]
Message-ID: <1476195969-23655-5-git-send-email-brian.starkey@arm.com> (raw)
In-Reply-To: <1476195969-23655-1-git-send-email-brian.starkey@arm.com>
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>
---
drivers/gpu/drm/arm/malidp_drv.c | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c
index f2b1923..62a29f6 100644
--- a/drivers/gpu/drm/arm/malidp_drv.c
+++ b/drivers/gpu/drm/arm/malidp_drv.c
@@ -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);
--
1.7.9.5
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2016-10-11 14:26 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-11 14:26 [PATCH 1/8] drm: mali-dp: Set the drm->irq_enabled flag to match driver's state Brian Starkey
2016-10-11 14:26 ` [PATCH 2/8] drm: mali-dp: Clear the config_valid flag before using it in wait_event Brian Starkey
2016-10-11 14:26 ` [PATCH 3/8] drm: mali-dp: Add pitch alignment check function Brian Starkey
2016-10-11 14:26 ` [PATCH 4/8] drm: mali-dp: Add pitch alignment check for planes Brian Starkey
2016-10-11 14:26 ` Brian Starkey [this message]
2016-10-11 14:26 ` [PATCH 6/8] drm: mali-dp: Refactor plane initialisation Brian Starkey
2016-10-11 14:26 ` [PATCH 7/8] drm: mali-dp: Enable alpha blending Brian Starkey
2016-10-11 14:26 ` [PATCH 8/8] drm: mali-dp: Store internal format and n_planes in plane state Brian Starkey
2016-10-11 15:03 ` [PATCH 1/8] drm: mali-dp: Set the drm->irq_enabled flag to match driver's state liviu.dudau
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1476195969-23655-5-git-send-email-brian.starkey@arm.com \
--to=brian.starkey@arm.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=liviu.dudau@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).