[v5,11/27] clk: bcm: rpi: Make sure the clkdev lookup is removed

Commit Message

Maxime Ripard June 15, 2020, 8:40 a.m. UTC

The clkdev lookup created for the cpufreq device is never removed if
there's an issue later in probe or at module removal time.

Let's convert to the managed variant of the clk_hw_register_clkdev function
to make sure it happens.

Cc: Michael Turquette <[e-mail]>
Cc: [e-mail]
Acked-by: Nicolas Saenz Julienne <[e-mail]>
Reviewed-by: Stephen Boyd <[e-mail]>
Tested-by: Nicolas Saenz Julienne <[e-mail]>
Signed-off-by: Maxime Ripard <[e-mail]>
---
 drivers/clk/bcm/clk-raspberrypi.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Comments

Stephen Boyd June 25, 2020, 12:44 a.m. UTC | #1

Quoting Maxime Ripard (2020-06-15 01:40:51)
> The clkdev lookup created for the cpufreq device is never removed if
> there's an issue later in probe or at module removal time.
> 
> Let's convert to the managed variant of the clk_hw_register_clkdev function
> to make sure it happens.
> 
> Cc: Michael Turquette <[e-mail]>
> Cc: [e-mail]
> Acked-by: Nicolas Saenz Julienne <[e-mail]>
> Reviewed-by: Stephen Boyd <[e-mail]>
> Tested-by: Nicolas Saenz Julienne <[e-mail]>
> Signed-off-by: Maxime Ripard <[e-mail]>
> ---

Applied to clk-next

Patch

diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c
index 23f06618a356..a20492fade6a 100644
--- a/drivers/clk/bcm/clk-raspberrypi.c
+++ b/drivers/clk/bcm/clk-raspberrypi.c
@@ -245,8 +245,9 @@  static int raspberrypi_register_pllb_arm(struct raspberrypi_clk *rpi)
 		return ret;
 	}
 
-	ret = clk_hw_register_clkdev(&raspberrypi_clk_pllb_arm.hw,
-				     NULL, "cpu0");
+	ret = devm_clk_hw_register_clkdev(rpi->dev,
+					  &raspberrypi_clk_pllb_arm.hw,
+					  NULL, "cpu0");
 	if (ret) {
 		dev_err(rpi->dev, "Failed to initialize clkdev\n");
 		return ret;