From: Martin Kaiser <martin@kaiser.cx>
To: Herbert Xu <herbert@gondor.apana.org.au>
Cc: aric.pzqi@ingenic.com, linux-crypto@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, Martin Kaiser <martin@kaiser.cx>
Subject: [PATCH 5/7] hwrng: ingenic - use dev_err_probe in error paths
Date: Mon, 10 Jul 2023 22:27:31 +0200 [thread overview]
Message-ID: <20230710202733.116133-6-martin@kaiser.cx> (raw)
In-Reply-To: <20230710202733.116133-1-martin@kaiser.cx>
Use dev_err_probe in error paths to make the code a bit shorter.
Signed-off-by: Martin Kaiser <martin@kaiser.cx>
---
drivers/char/hw_random/ingenic-trng.c | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/drivers/char/hw_random/ingenic-trng.c b/drivers/char/hw_random/ingenic-trng.c
index 906fa78de47e..cc88a941c929 100644
--- a/drivers/char/hw_random/ingenic-trng.c
+++ b/drivers/char/hw_random/ingenic-trng.c
@@ -84,16 +84,14 @@ static int ingenic_trng_probe(struct platform_device *pdev)
return -ENOMEM;
trng->base = devm_platform_ioremap_resource(pdev, 0);
- if (IS_ERR(trng->base)) {
- pr_err("%s: Failed to map DTRNG registers\n", __func__);
- return PTR_ERR(trng->base);
- }
+ if (IS_ERR(trng->base))
+ return dev_err_probe(&pdev->dev, PTR_ERR(trng->base),
+ "%s: Failed to map DTRNG registers\n", __func__);
clk = devm_clk_get_enabled(&pdev->dev, NULL);
- if (IS_ERR(clk)) {
- pr_crit("%s: Cannot get and enable DTRNG clock\n", __func__);
- return PTR_ERR(clk);
- }
+ if (IS_ERR(clk))
+ return dev_err_probe(&pdev->dev, PTR_ERR(clk),
+ "%s: Cannot get and enable DTRNG clock\n", __func__);
trng->rng.name = pdev->name;
trng->rng.init = ingenic_trng_init;
@@ -101,10 +99,8 @@ static int ingenic_trng_probe(struct platform_device *pdev)
trng->rng.read = ingenic_trng_read;
ret = hwrng_register(&trng->rng);
- if (ret) {
- dev_err(&pdev->dev, "Failed to register hwrng\n");
- return ret;
- }
+ if (ret)
+ return dev_err_probe(&pdev->dev, ret, "Failed to register hwrng\n");
platform_set_drvdata(pdev, trng);
--
2.30.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2023-07-10 20:30 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-10 20:27 hwrng: ingenic: simplify the code Martin Kaiser
2023-07-10 20:27 ` [PATCH 1/7] hwrng: ingenic - enable compile testing Martin Kaiser
2023-07-10 20:27 ` [PATCH 2/7] hwrng: ingenic - remove two unused defines Martin Kaiser
2023-07-10 20:27 ` [PATCH 3/7] hwrng: ingenic - remove dead assignments Martin Kaiser
2023-07-10 20:27 ` [PATCH 4/7] hwrng: ingenic - use devm_clk_get_enabled Martin Kaiser
2023-07-10 20:27 ` Martin Kaiser [this message]
2023-07-10 20:27 ` [PATCH 6/7] hwrng: ingenic - don't disable the rng in ingenic_trng_remove Martin Kaiser
2023-07-10 20:27 ` [PATCH 7/7] hwrng: ingenic - switch to device managed registration Martin Kaiser
2023-07-22 2:13 ` hwrng: ingenic: simplify the code Herbert Xu
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=20230710202733.116133-6-martin@kaiser.cx \
--to=martin@kaiser.cx \
--cc=aric.pzqi@ingenic.com \
--cc=herbert@gondor.apana.org.au \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-crypto@vger.kernel.org \
--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).