[PATCH v2] hwrng: meson - Improve error handling for core clock

Uwe Kleine-König u.kleine-koenig at pengutronix.de
Mon Sep 20 00:44:05 PDT 2021


-ENOENT (ie. "there is no clock") is fine to ignore for an optional
clock, other values are not supposed to be ignored and should be
escalated to the caller (e.g. -EPROBE_DEFER). Ignore -ENOENT by using
devm_clk_get_optional().

While touching this code also add an error message for the fatal errors.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig at pengutronix.de>
---
Hello,

compared to (implicit) v1
(https://lore.kernel.org/r/20210914142428.57099-1-u.kleine-koenig@pengutronix.de)
this used dev_err_probe() as suggested by Martin Blumenstingl.

v1 got a "Reviewed-by: Neil Armstrong <narmstrong at baylibre.com>", I didn't add
that because of the above change.

(Hmm, my setup is broken, the b4 patch signature was done before I added this
message. I wonder if this will break the signature ...)

Best regards
Uwe

 drivers/char/hw_random/meson-rng.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/char/hw_random/meson-rng.c b/drivers/char/hw_random/meson-rng.c
index e446236e81f2..8bb30282ca46 100644
--- a/drivers/char/hw_random/meson-rng.c
+++ b/drivers/char/hw_random/meson-rng.c
@@ -54,9 +54,10 @@ static int meson_rng_probe(struct platform_device *pdev)
 	if (IS_ERR(data->base))
 		return PTR_ERR(data->base);
 
-	data->core_clk = devm_clk_get(dev, "core");
+	data->core_clk = devm_clk_get_optional(dev, "core");
 	if (IS_ERR(data->core_clk))
-		data->core_clk = NULL;
+		return dev_err_probe(dev, PTR_ERR(data->core_clk),
+				     "Failed to get core clock\n");
 
 	if (data->core_clk) {
 		ret = clk_prepare_enable(data->core_clk);

base-commit: 7d2a07b769330c34b4deabeed939325c77a7ec2f
-- 
2.30.2




More information about the linux-amlogic mailing list