2020-08-26 15:33:52

by Krzysztof Kozlowski

Subject: [PATCH] hwrng: cctrn - Simplify with dev_err_probe()

Common pattern of handling deferred probe can be simplified with
dev_err_probe(). Less code and also it prints the error value.

Signed-off-by: Krzysztof Kozlowski <[email protected]>
---
drivers/char/hw_random/cctrng.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/drivers/char/hw_random/cctrng.c b/drivers/char/hw_random/cctrng.c
index 619148fb2dc9..7a293f2147a0 100644
--- a/drivers/char/hw_random/cctrng.c
+++ b/drivers/char/hw_random/cctrng.c
@@ -463,11 +463,10 @@ static int cc_trng_clk_init(struct cctrng_drvdata *drvdata)
int rc = 0;

clk = devm_clk_get_optional(dev, NULL);
- if (IS_ERR(clk)) {
- if (PTR_ERR(clk) != -EPROBE_DEFER)
- dev_err(dev, "Error getting clock: %pe\n", clk);
- return PTR_ERR(clk);
- }
+ if (IS_ERR(clk))
+ return dev_err_probe(dev, PTR_ERR(clk),
+ "Error getting clock\n");
+
drvdata->clk = clk;

rc = clk_prepare_enable(drvdata->clk);
--
2.17.1

2020-08-27 14:13:52

by Hadar Gat

Subject: RE: [PATCH] hwrng: cctrn - Simplify with dev_err_probe()

Hi Krzysztof,

> Common pattern of handling deferred probe can be simplified with
> dev_err_probe(). Less code and also it prints the error value.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> drivers/char/hw_random/cctrng.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/char/hw_random/cctrng.c
> b/drivers/char/hw_random/cctrng.c index 619148fb2dc9..7a293f2147a0
> 100644
> --- a/drivers/char/hw_random/cctrng.c
> +++ b/drivers/char/hw_random/cctrng.c
> @@ -463,11 +463,10 @@ static int cc_trng_clk_init(struct cctrng_drvdata
> *drvdata)
> int rc = 0;
>
> clk = devm_clk_get_optional(dev, NULL);
> - if (IS_ERR(clk)) {
> - if (PTR_ERR(clk) != -EPROBE_DEFER)
> - dev_err(dev, "Error getting clock: %pe\n", clk);
> - return PTR_ERR(clk);
> - }
> + if (IS_ERR(clk))
> + return dev_err_probe(dev, PTR_ERR(clk),
> + "Error getting clock\n");
> +
> drvdata->clk = clk;
>
> rc = clk_prepare_enable(drvdata->clk);
> --
> 2.17.1

Thanks for this code simplification. :-)

Acked-by: Hadar Gat <[email protected]>

Hadar

2020-09-04 08:28:44

by Herbert Xu

Subject: Re: [PATCH] hwrng: cctrn - Simplify with dev_err_probe()

On Wed, Aug 26, 2020 at 05:32:33PM +0200, Krzysztof Kozlowski wrote:
> Common pattern of handling deferred probe can be simplified with
> dev_err_probe(). Less code and also it prints the error value.
>
> Signed-off-by: Krzysztof Kozlowski <[email protected]>
> ---
> drivers/char/hw_random/cctrng.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)

Patch applied. Thanks.
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt