[PATCH 4.19 041/101] Revert "clk: meson: clean-up clock registration"

[Greg Kroah-Hartman]

This reverts commit c8e4f8406842332fb55cd792016e5dac266f6354.

This patch was not initially a fix and is dependent on other
changes which are not fixes eithers.

With this change, multiple Amlogic based boards fails to boot,
as reported by kernelci.

Cc: sta...@vger.kernel.org # 4.19.34
Signed-off-by: Neil Armstrong <narmstr...@baylibre.com>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 drivers/clk/meson/meson-aoclk.c | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/drivers/clk/meson/meson-aoclk.c b/drivers/clk/meson/meson-aoclk.c
index 258c8d259ea1..f965845917e3 100644
--- a/drivers/clk/meson/meson-aoclk.c
+++ b/drivers/clk/meson/meson-aoclk.c
@@ -65,20 +65,15 @@ int meson_aoclkc_probe(struct platform_device *pdev)
                return ret;
        }
 
-       /* Populate regmap */
-       for (clkid = 0; clkid < data->num_clks; clkid++)
+       /*
+        * Populate regmap and register all clks
+        */
+       for (clkid = 0; clkid < data->num_clks; clkid++) {
                data->clks[clkid]->map = regmap;
 
-       /* Register all clks */
-       for (clkid = 0; clkid < data->hw_data->num; clkid++) {
-               if (!data->hw_data->hws[clkid])
-                       continue;
-
                ret = devm_clk_hw_register(dev, data->hw_data->hws[clkid]);
-               if (ret) {
-                       dev_err(dev, "Clock registration failed\n");
+               if (ret)
                        return ret;
-               }
        }
 
        return devm_of_clk_add_hw_provider(dev, of_clk_hw_onecell_get,
-- 
2.19.1