Merge branches 'clk-ingenic', 'clk-mtk-mux', 'clk-qcom-sdm845-pcie', 'clk-mtk-crit...

[sfrench/cifs-2.6.git] / drivers / clk / qcom / gcc-sdm660.c

diff --git a/drivers/clk/qcom/gcc-sdm660.c b/drivers/clk/qcom/gcc-sdm660.c
index ba239ea4c842a42052cff211e5d0a132b6607865..8827db23066f5926894c3088ab71411346d8ec01 100644 (file)
--- a/drivers/clk/qcom/gcc-sdm660.c
+++ b/drivers/clk/qcom/gcc-sdm660.c
@@ -2420,6 +2420,8 @@ static const struct qcom_cc_desc gcc_sdm660_desc = {
        .num_resets = ARRAY_SIZE(gcc_sdm660_resets),
        .gdscs = gcc_sdm660_gdscs,
        .num_gdscs = ARRAY_SIZE(gcc_sdm660_gdscs),
+       .clk_hws = gcc_sdm660_hws,
+       .num_clk_hws = ARRAY_SIZE(gcc_sdm660_hws),
 };
 
 static const struct of_device_id gcc_sdm660_match_table[] = {
@@ -2431,7 +2433,7 @@ MODULE_DEVICE_TABLE(of, gcc_sdm660_match_table);
 
 static int gcc_sdm660_probe(struct platform_device *pdev)
 {
-       int i, ret;
+       int ret;
        struct regmap *regmap;
 
        regmap = qcom_cc_map(pdev, &gcc_sdm660_desc);
@@ -2446,13 +2448,6 @@ static int gcc_sdm660_probe(struct platform_device *pdev)
        if (ret)
                return ret;
 
-       /* Register the hws */
-       for (i = 0; i < ARRAY_SIZE(gcc_sdm660_hws); i++) {
-               ret = devm_clk_hw_register(&pdev->dev, gcc_sdm660_hws[i]);
-               if (ret)
-                       return ret;
-       }
-
        return qcom_cc_really_probe(pdev, &gcc_sdm660_desc, regmap);
 }