From: Lubomir Rintel <lkundrak@v3.sk>
To: Lucas Stach <l.stach@pengutronix.de>
Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
etnaviv@lists.freedesktop.org, Lubomir Rintel <lkundrak@v3.sk>,
Russell King <linux+etnaviv@armlinux.org.uk>
Subject: [PATCH 2/3] drm/etnaviv: Don't ignore errors on getting clocks
Date: Wed, 13 May 2020 17:00:06 +0200 [thread overview]
Message-ID: <20200513150007.1315395-3-lkundrak@v3.sk> (raw)
In-Reply-To: <20200513150007.1315395-1-lkundrak@v3.sk>
There might be good reasons why the getting a clock failed. To treat the
clocks as optional we're specifically only interested in ignoring -ENOENT,
and devm_clk_get_optional() does just that.
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
index c6dacfe3d321..e7dbb924f576 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
@@ -1786,26 +1786,26 @@ static int etnaviv_gpu_platform_probe(struct platform_device *pdev)
}
/* Get Clocks: */
- gpu->clk_reg = devm_clk_get(&pdev->dev, "reg");
+ gpu->clk_reg = devm_clk_get_optional(&pdev->dev, "reg");
DBG("clk_reg: %p", gpu->clk_reg);
if (IS_ERR(gpu->clk_reg))
- gpu->clk_reg = NULL;
+ return err;
- gpu->clk_bus = devm_clk_get(&pdev->dev, "bus");
+ gpu->clk_bus = devm_clk_get_optional(&pdev->dev, "bus");
DBG("clk_bus: %p", gpu->clk_bus);
if (IS_ERR(gpu->clk_bus))
- gpu->clk_bus = NULL;
+ return err;
- gpu->clk_core = devm_clk_get(&pdev->dev, "core");
+ gpu->clk_core = devm_clk_get_optional(&pdev->dev, "core");
DBG("clk_core: %p", gpu->clk_core);
if (IS_ERR(gpu->clk_core))
- gpu->clk_core = NULL;
+ return err;
gpu->base_rate_core = clk_get_rate(gpu->clk_core);
- gpu->clk_shader = devm_clk_get(&pdev->dev, "shader");
+ gpu->clk_shader = devm_clk_get_optional(&pdev->dev, "shader");
DBG("clk_shader: %p", gpu->clk_shader);
if (IS_ERR(gpu->clk_shader))
- gpu->clk_shader = NULL;
+ return err;
gpu->base_rate_shader = clk_get_rate(gpu->clk_shader);
/* TODO: figure out max mapped size */
--
2.26.2
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-05-15 6:53 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <[PATCH 0/3] drm/etnaviv: Clock fixes>
[not found] ` <20200513150007.1315395-1-lkundrak@v3.sk>
2020-05-13 15:00 ` [PATCH 1/3] drm/etnaviv: Fix error path on failure to enable bus clk Lubomir Rintel
2020-05-13 15:00 ` Lubomir Rintel [this message]
2020-05-13 16:07 ` [PATCH 2/3] drm/etnaviv: Don't ignore errors on getting clocks Fabio Estevam
2020-05-13 17:09 ` Fabio Estevam
2020-05-14 2:41 ` Fabio Estevam
2020-05-14 8:18 ` Lucas Stach
2020-05-14 8:27 ` Russell King - ARM Linux admin
2020-05-14 8:40 ` Lucas Stach
2020-05-14 8:53 ` Russell King - ARM Linux admin
2020-05-20 13:38 ` Lubomir Rintel
2020-05-20 14:04 ` Lucas Stach
2020-05-20 15:00 ` Russell King - ARM Linux admin
2020-05-23 10:22 ` Lubomir Rintel
2020-05-13 15:00 ` [PATCH 3/3] drm/etnaviv: Simplify clock enable/disable Lubomir Rintel
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=20200513150007.1315395-3-lkundrak@v3.sk \
--to=lkundrak@v3.sk \
--cc=dri-devel@lists.freedesktop.org \
--cc=etnaviv@lists.freedesktop.org \
--cc=l.stach@pengutronix.de \
--cc=linux+etnaviv@armlinux.org.uk \
--cc=linux-kernel@vger.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).