Skip to content

Commit 683de18

Browse files
mripardbebarino
authored andcommitted
clk: bcm: rpi: Make sure pllb_arm is removed
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: Stephen Boyd <[email protected]> Cc: [email protected] Acked-by: Nicolas Saenz Julienne <[email protected]> Reviewed-by: Stephen Boyd <[email protected]> Tested-by: Nicolas Saenz Julienne <[email protected]> Signed-off-by: Maxime Ripard <[email protected]> Link: https://lore.kernel.org/r/34254ed1556614658e5dad5cca4cf4fe617df7fc.1592210452.git-series.maxime@cerno.tech Signed-off-by: Stephen Boyd <[email protected]>
1 parent c70011a commit 683de18

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

drivers/clk/bcm/clk-raspberrypi.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ static int raspberrypi_register_pllb_arm(struct raspberrypi_clk *rpi)
240240
{
241241
int ret;
242242

243-
ret = clk_hw_register(rpi->dev, &raspberrypi_clk_pllb_arm.hw);
243+
ret = devm_clk_hw_register(rpi->dev, &raspberrypi_clk_pllb_arm.hw);
244244
if (ret) {
245245
dev_err(rpi->dev, "Failed to initialize pllb_arm\n");
246246
return ret;
@@ -250,7 +250,6 @@ static int raspberrypi_register_pllb_arm(struct raspberrypi_clk *rpi)
250250
NULL, "cpu0");
251251
if (!rpi->pllb_arm_lookup) {
252252
dev_err(rpi->dev, "Failed to initialize pllb_arm_lookup\n");
253-
clk_hw_unregister_fixed_factor(&raspberrypi_clk_pllb_arm.hw);
254253
return -ENOMEM;
255254
}
256255

0 commit comments

Comments
 (0)