You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
From 5272507555c0ecf02c0dfd78303e86e8eb096191 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Fri, 7 Feb 2020 15:41:37 +0100
|
|
Subject: [PATCH] clk: bcm: rpi: Remove global pllb_arm clock pointer
|
|
|
|
The pllb_arm clk_hw pointer in the raspberry_clk structure isn't used
|
|
anywhere but in the raspberrypi_register_pllb_arm.
|
|
|
|
Let's remove it, this will make our lives easier in future patches.
|
|
|
|
Cc: Michael Turquette <mturquette@baylibre.com>
|
|
Cc: Stephen Boyd <sboyd@kernel.org>
|
|
Cc: linux-clk@vger.kernel.org
|
|
Acked-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/clk/bcm/clk-raspberrypi.c | 7 +++----
|
|
1 file changed, 3 insertions(+), 4 deletions(-)
|
|
|
|
--- a/drivers/clk/bcm/clk-raspberrypi.c
|
|
+++ b/drivers/clk/bcm/clk-raspberrypi.c
|
|
@@ -40,7 +40,6 @@ struct raspberrypi_clk {
|
|
unsigned long max_rate;
|
|
|
|
struct clk_hw pllb;
|
|
- struct clk_hw *pllb_arm;
|
|
struct clk_lookup *pllb_arm_lookup;
|
|
};
|
|
|
|
@@ -246,12 +245,12 @@ static int raspberrypi_register_pllb_arm
|
|
dev_err(rpi->dev, "Failed to initialize pllb_arm\n");
|
|
return ret;
|
|
}
|
|
- rpi->pllb_arm = &raspberrypi_clk_pllb_arm.hw;
|
|
|
|
- rpi->pllb_arm_lookup = clkdev_hw_create(rpi->pllb_arm, NULL, "cpu0");
|
|
+ rpi->pllb_arm_lookup = clkdev_hw_create(&raspberrypi_clk_pllb_arm.hw,
|
|
+ NULL, "cpu0");
|
|
if (!rpi->pllb_arm_lookup) {
|
|
dev_err(rpi->dev, "Failed to initialize pllb_arm_lookup\n");
|
|
- clk_hw_unregister_fixed_factor(rpi->pllb_arm);
|
|
+ clk_hw_unregister_fixed_factor(&raspberrypi_clk_pllb_arm.hw);
|
|
return -ENOMEM;
|
|
}
|
|
|