The pllb_arm clock was created at probe time, but was never removed if
something went wrong later in probe, or if the driver was ever removed from
the system.

Now that we are using clk_hw_register, we can just use its managed variant
to take care of that for us.

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

diff --git a/drivers/clk/bcm/clk-raspberrypi.c 
b/drivers/clk/bcm/clk-raspberrypi.c
index a99e8189311f..859eac020122 100644
--- a/drivers/clk/bcm/clk-raspberrypi.c
+++ b/drivers/clk/bcm/clk-raspberrypi.c
@@ -240,7 +240,7 @@ static int raspberrypi_register_pllb_arm(struct 
raspberrypi_clk *rpi)
 {
        int ret;
 
-       ret = clk_hw_register(rpi->dev, &raspberrypi_clk_pllb_arm.hw);
+       ret = devm_clk_hw_register(rpi->dev, &raspberrypi_clk_pllb_arm.hw);
        if (ret) {
                dev_err(rpi->dev, "Failed to initialize pllb_arm\n");
                return ret;
@@ -250,7 +250,6 @@ static int raspberrypi_register_pllb_arm(struct 
raspberrypi_clk *rpi)
                                                NULL, "cpu0");
        if (!rpi->pllb_arm_lookup) {
                dev_err(rpi->dev, "Failed to initialize pllb_arm_lookup\n");
-               clk_hw_unregister_fixed_factor(&raspberrypi_clk_pllb_arm.hw);
                return -ENOMEM;
        }
 
-- 
git-series 0.9.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Reply via email to