From: Stefan Agner <stefan@agner.ch>
To: dri-devel@lists.freedesktop.org, shawnguo@kernel.org, stefan@agner.ch
Cc: meng.yi@nxp.com, pawel.moll@arm.com, alison.wang@freescale.com,
daniel.vetter@ffwll.ch, mturquette@baylibre.com,
ijc+devicetree@hellion.org.uk, sboyd@codeaurora.org,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
robh+dt@kernel.org, kernel@pengutronix.de, galak@codeaurora.org,
mark.rutland@arm.com, linux-arm-kernel@lists.infradead.org,
alexander.stein@systec-electronic.com
Subject: [PATCH v3 3/9] drm/fsl-dcu: disable clock on initialization failure and remove
Date: Mon, 4 Apr 2016 22:28:35 -0700 [thread overview]
Message-ID: <1459834121-25997-4-git-send-email-stefan@agner.ch> (raw)
In-Reply-To: <1459834121-25997-1-git-send-email-stefan@agner.ch>
Fix error handling during probe by reordering initialization and
adding a error path which disables clock again. Also disable the
clock on remove.
Signed-off-by: Stefan Agner <stefan@agner.ch>
---
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 44 +++++++++++++++----------------
1 file changed, 21 insertions(+), 23 deletions(-)
diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
index e8d9337..f2a9c1b 100644
--- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
+++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c
@@ -290,6 +290,11 @@ static int fsl_dcu_drm_probe(struct platform_device *pdev)
if (!fsl_dev)
return -ENOMEM;
+ id = of_match_node(fsl_dcu_of_match, pdev->dev.of_node);
+ if (!id)
+ return -ENODEV;
+ fsl_dev->soc = id->data;
+
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) {
dev_err(dev, "could not get memory IO resource\n");
@@ -308,39 +313,29 @@ static int fsl_dcu_drm_probe(struct platform_device *pdev)
return -ENXIO;
}
+ fsl_dev->regmap = devm_regmap_init_mmio(dev, base,
+ &fsl_dcu_regmap_config);
+ if (IS_ERR(fsl_dev->regmap)) {
+ dev_err(dev, "regmap init failed\n");
+ return PTR_ERR(fsl_dev->regmap);
+ }
+
fsl_dev->clk = devm_clk_get(dev, "dcu");
if (IS_ERR(fsl_dev->clk)) {
- ret = PTR_ERR(fsl_dev->clk);
dev_err(dev, "failed to get dcu clock\n");
- return ret;
- }
- ret = clk_prepare(fsl_dev->clk);
- if (ret < 0) {
- dev_err(dev, "failed to prepare dcu clk\n");
- return ret;
+ return PTR_ERR(fsl_dev->clk);
}
- ret = clk_enable(fsl_dev->clk);
+ ret = clk_prepare_enable(fsl_dev->clk);
if (ret < 0) {
dev_err(dev, "failed to enable dcu clk\n");
- clk_unprepare(fsl_dev->clk);
return ret;
}
- fsl_dev->regmap = devm_regmap_init_mmio(dev, base,
- &fsl_dcu_regmap_config);
- if (IS_ERR(fsl_dev->regmap)) {
- dev_err(dev, "regmap init failed\n");
- return PTR_ERR(fsl_dev->regmap);
- }
-
- id = of_match_node(fsl_dcu_of_match, pdev->dev.of_node);
- if (!id)
- return -ENODEV;
- fsl_dev->soc = id->data;
-
drm = drm_dev_alloc(driver, dev);
- if (!drm)
- return -ENOMEM;
+ if (!drm) {
+ ret = -ENOMEM;
+ goto disable_clk;
+ }
fsl_dev->dev = dev;
fsl_dev->drm = drm;
@@ -360,6 +355,8 @@ static int fsl_dcu_drm_probe(struct platform_device *pdev)
unref:
drm_dev_unref(drm);
+disable_clk:
+ clk_disable_unprepare(fsl_dev->clk);
return ret;
}
@@ -367,6 +364,7 @@ static int fsl_dcu_drm_remove(struct platform_device *pdev)
{
struct fsl_dcu_drm_device *fsl_dev = platform_get_drvdata(pdev);
+ clk_disable_unprepare(fsl_dev->clk);
drm_put_dev(fsl_dev->drm);
return 0;
--
2.7.4
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2016-04-05 5:28 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-05 5:28 [PATCH v3 0/9] add TCON and Vybrid support Stefan Agner
2016-04-05 5:28 ` [PATCH v3 1/9] ARM: imx: clk-vf610: fix DCU clock tree Stefan Agner
2016-04-12 1:38 ` Shawn Guo
2016-04-13 5:21 ` Stefan Agner
2016-04-16 0:31 ` Stephen Boyd
2016-04-05 5:28 ` [PATCH v3 2/9] ARM: imx: clk-vf610: add TCON ipg clock Stefan Agner
2016-04-05 5:28 ` Stefan Agner [this message]
2016-04-05 5:28 ` [PATCH v3 4/9] drm/fsl-dcu: add extra clock for pixel clock Stefan Agner
2016-04-07 17:57 ` Rob Herring
2016-04-05 5:28 ` [PATCH v3 5/9] drm/fsl-dcu: use common clock framework for pixel clock divider Stefan Agner
2016-04-05 5:28 ` [PATCH v3 6/9] drm/fsl-dcu: add TCON driver Stefan Agner
2016-04-05 5:28 ` [PATCH v3 7/9] ARM: dts: vf610: add display nodes Stefan Agner
2016-04-13 6:13 ` Shawn Guo
2016-04-05 5:28 ` [PATCH v3 8/9] ARM: dts: vf610-colibri: enable display controller Stefan Agner
2016-04-05 5:28 ` [PATCH v3 9/9] ARM: dts: ls1021a: add pix clock to DCU dts node Stefan Agner
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=1459834121-25997-4-git-send-email-stefan@agner.ch \
--to=stefan@agner.ch \
--cc=alexander.stein@systec-electronic.com \
--cc=alison.wang@freescale.com \
--cc=daniel.vetter@ffwll.ch \
--cc=devicetree@vger.kernel.org \
--cc=dri-devel@lists.freedesktop.org \
--cc=galak@codeaurora.org \
--cc=ijc+devicetree@hellion.org.uk \
--cc=kernel@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=meng.yi@nxp.com \
--cc=mturquette@baylibre.com \
--cc=pawel.moll@arm.com \
--cc=robh+dt@kernel.org \
--cc=sboyd@codeaurora.org \
--cc=shawnguo@kernel.org \
/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).