Skip to contentSkip to conversation

hwrng: imx-rngc - use dev_err_probe

PATCH In review Martin Kaiser 4 participants 4 messages Jul 4, 2023 – Jul 14, 2023

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hwrng: imx-rngc - use dev_err_probe

Simplify the code by calling dev_err_probe instead of dev_err and return.

While at it, use the same device for all error messages.

---
 drivers/char/hw_random/imx-rngc.c | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)
drivers/char/hw_random/imx-rngc.c +8 -16
index bf07f17f78c8..e4b385b01b11 100644
@@ -239,10 +239,8 @@ static int __init imx_rngc_probe(struct platform_device *pdev)
 		return PTR_ERR(rngc->base);
 
 	rngc->clk = devm_clk_get_enabled(&pdev->dev, NULL);
-	if (IS_ERR(rngc->clk)) {
-		dev_err(&pdev->dev, "Can not get rng_clk\n");
-		return PTR_ERR(rngc->clk);
-	}
+	if (IS_ERR(rngc->clk))
+		return dev_err_probe(&pdev->dev, PTR_ERR(rngc->clk), "Cannot get rng_clk\n");
 
 	irq = platform_get_irq(pdev, 0);
 	if (irq < 0)
@@ -272,24 +270,18 @@ static int __init imx_rngc_probe(struct platform_device *pdev)
 
 	ret = devm_request_irq(&pdev->dev,
 			irq, imx_rngc_irq, 0, pdev->name, (void *)rngc);
-	if (ret) {
-		dev_err(rngc->dev, "Can't get interrupt working.\n");
-		return ret;
-	}
+	if (ret)
+		return dev_err_probe(&pdev->dev, ret, "Can't get interrupt working.\n");
 
 	if (self_test) {
 		ret = imx_rngc_self_test(rngc);
-		if (ret) {
-			dev_err(rngc->dev, "self test failed\n");
-			return ret;
-		}
+		if (ret)
+			return dev_err_probe(&pdev->dev, ret, "self test failed\n");
 	}
 
 	ret = devm_hwrng_register(&pdev->dev, &rngc->rng);
-	if (ret) {
-		dev_err(&pdev->dev, "hwrng registration failed\n");
-		return ret;
-	}
+	if (ret)
+		return dev_err_probe(&pdev->dev, ret, "hwrng registration failed\n");
 
 	dev_info(&pdev->dev,
 		"Freescale RNG%c registered (HW revision %d.%02d)\n",
Signature · 1 line
2.30.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 6 lines · On Tue, 4 Jul 2023 19:06:44 +0200 Martin Kaiser <[email protected]> wrote:

Simplify the code by calling dev_err_probe instead of dev_err and return.

While at it, use the same device for all error messages.

Quoted 53 lines
---
 drivers/char/hw_random/imx-rngc.c | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)
(quoted diff) +0 -0

b/drivers/char/hw_random/imx-rngc.c index bf07f17f78c8..e4b385b01b11 100644 --- a/drivers/char/hw_random/imx-rngc.c
+++ b/drivers/char/hw_random/imx-rngc.c

drivers/char/hw_random/imx-rngc.c +8 -16
@@ -239,10 +239,8 @@ static int __init imx_rngc_probe(struct
 platform_device *pdev) return PTR_ERR(rngc->base);
 
 	rngc->clk = devm_clk_get_enabled(&pdev->dev, NULL);
-	if (IS_ERR(rngc->clk)) {
-		dev_err(&pdev->dev, "Can not get rng_clk\n");
-		return PTR_ERR(rngc->clk);
-	}
+	if (IS_ERR(rngc->clk))
+		return dev_err_probe(&pdev->dev, PTR_ERR(rngc->clk),
 "Cannot get rng_clk\n"); 
 	irq = platform_get_irq(pdev, 0);
 	if (irq < 0)
@@ -272,24 +270,18 @@ static int __init imx_rngc_probe(struct
 platform_device *pdev) 
 	ret = devm_request_irq(&pdev->dev,
 			irq, imx_rngc_irq, 0, pdev->name, (void
 *)rngc);
-	if (ret) {
-		dev_err(rngc->dev, "Can't get interrupt working.\n");
-		return ret;
-	}
+	if (ret)
+		return dev_err_probe(&pdev->dev, ret, "Can't get
 interrupt working.\n"); 
 	if (self_test) {
 		ret = imx_rngc_self_test(rngc);
-		if (ret) {
-			dev_err(rngc->dev, "self test failed\n");
-			return ret;
-		}
+		if (ret)
+			return dev_err_probe(&pdev->dev, ret, "self
 test failed\n"); }
 
 	ret = devm_hwrng_register(&pdev->dev, &rngc->rng);
-	if (ret) {
-		dev_err(&pdev->dev, "hwrng registration failed\n");
-		return ret;
-	}
+	if (ret)
+		return dev_err_probe(&pdev->dev, ret, "hwrng
 registration failed\n"); 
 	dev_info(&pdev->dev,

"Freescale RNG%c registered (HW revision %d.%02d)\n",

Reviewed-by
#2 lore raw

Hi,

Quoted 11 lines · On Wed, 5 Jul 2023 07:14:31 +0200 Rouven Czerwinski <[email protected]> wrote:
Quoted 6 lines · On Tue, 4 Jul 2023 19:06:44 +0200 Martin Kaiser <[email protected]> wrote:

Simplify the code by calling dev_err_probe instead of dev_err and return.

While at it, use the same device for all error messages.

Please disregard the first tag, the correct one should be

(note the missing s), I also fixed the mail address for this new mailer.

Sorry for the noise, shouldn't review before the first tea.

Best regards,

Rouven

Quoted 58 lines
Quoted 56 lines
---
 drivers/char/hw_random/imx-rngc.c | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)
(quoted diff) +0 -0

b/drivers/char/hw_random/imx-rngc.c index bf07f17f78c8..e4b385b01b11 100644 --- a/drivers/char/hw_random/imx-rngc.c
+++ b/drivers/char/hw_random/imx-rngc.c

drivers/char/hw_random/imx-rngc.c +8 -16
@@ -239,10 +239,8 @@ static int __init imx_rngc_probe(struct
 platform_device *pdev) return PTR_ERR(rngc->base);
 
 	rngc->clk = devm_clk_get_enabled(&pdev->dev, NULL);
-	if (IS_ERR(rngc->clk)) {
-		dev_err(&pdev->dev, "Can not get rng_clk\n");
-		return PTR_ERR(rngc->clk);
-	}
+	if (IS_ERR(rngc->clk))
+		return dev_err_probe(&pdev->dev,
 PTR_ERR(rngc->clk), "Cannot get rng_clk\n"); 
 	irq = platform_get_irq(pdev, 0);
 	if (irq < 0)
@@ -272,24 +270,18 @@ static int __init imx_rngc_probe(struct
 platform_device *pdev) 
 	ret = devm_request_irq(&pdev->dev,
 			irq, imx_rngc_irq, 0, pdev->name, (void
 *)rngc);
-	if (ret) {
-		dev_err(rngc->dev, "Can't get interrupt
 working.\n");
-		return ret;
-	}
+	if (ret)
+		return dev_err_probe(&pdev->dev, ret, "Can't get
 interrupt working.\n"); 
 	if (self_test) {
 		ret = imx_rngc_self_test(rngc);
-		if (ret) {
-			dev_err(rngc->dev, "self test failed\n");
-			return ret;
-		}
+		if (ret)
+			return dev_err_probe(&pdev->dev, ret, "self
 test failed\n"); }
 
 	ret = devm_hwrng_register(&pdev->dev, &rngc->rng);
-	if (ret) {
-		dev_err(&pdev->dev, "hwrng registration failed\n");
-		return ret;
-	}
+	if (ret)
+		return dev_err_probe(&pdev->dev, ret, "hwrng
 registration failed\n"); 
(quoted diff) +0 -0
 	dev_info(&pdev->dev,
 		"Freescale RNG%c registered (HW revision

%d.%02d)\n",

maintainer
#3 lore raw
In reply to Martin Kaiser
Quoted 8 lines · Martin Kaiser

Simplify the code by calling dev_err_probe instead of dev_err and return.

While at it, use the same device for all error messages.

---
 drivers/char/hw_random/imx-rngc.c | 24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)

Patch applied. Thanks.

Signature · 3 lines
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt