clk: sunxi-ng: convert from divider_round_rate_parent() to divider_determine_rate()

The divider_round_rate_parent() function is now deprecated, so let's
migrate to divider_determine_rate() instead so that this deprecated API
can be removed. Also go ahead and convert all of the driver from round
rate type to determine rate that accepts a 'struct clk_rate_request' to
simplify the overall driver code.

Acked-by: Chen-Yu Tsai <wens@kernel.org>
Signed-off-by: Brian Masney <bmasney@redhat.com>

diff --git a/drivers/clk/sunxi-ng/ccu_div.c b/drivers/clk/sunxi-ng/ccu_div.c
index 916d6da6d8a3b29240e086eaebbbc620346eef91..62d680ccb524b39d54f0e908c79736f0619f1b4b 100644 (file)
--- a/drivers/clk/sunxi-ng/ccu_div.c
+++ b/drivers/clk/sunxi-ng/ccu_div.c
@@ -10,26 +10,25 @@
 #include "ccu_gate.h"
 #include "ccu_div.h"
 
-static unsigned long ccu_div_round_rate(struct ccu_mux_internal *mux,
-                                       struct clk_hw *parent,
-                                       unsigned long *parent_rate,
-                                       unsigned long rate,
-                                       void *data)
+static int ccu_div_determine_rate_helper(struct ccu_mux_internal *mux,
+                                        struct clk_rate_request *req,
+                                        void *data)
 {
        struct ccu_div *cd = data;
+       int ret;
 
        if (cd->common.features & CCU_FEATURE_FIXED_POSTDIV)
-               rate *= cd->fixed_post_div;
+               req->rate *= cd->fixed_post_div;
 
-       rate = divider_round_rate_parent(&cd->common.hw, parent,
-                                        rate, parent_rate,
-                                        cd->div.table, cd->div.width,
-                                        cd->div.flags);
+       ret = divider_determine_rate(&cd->common.hw, req, cd->div.table,
+                                    cd->div.width, cd->div.flags);
+       if (ret)
+               return ret;
 
        if (cd->common.features & CCU_FEATURE_FIXED_POSTDIV)
-               rate /= cd->fixed_post_div;
+               req->rate /= cd->fixed_post_div;
 
-       return rate;
+       return 0;
 }
 
 static void ccu_div_disable(struct clk_hw *hw)
@@ -82,7 +81,7 @@ static int ccu_div_determine_rate(struct clk_hw *hw,
        struct ccu_div *cd = hw_to_ccu_div(hw);
 
        return ccu_mux_helper_determine_rate(&cd->common, &cd->mux,
-                                            req, ccu_div_round_rate, cd);
+                                            req, ccu_div_determine_rate_helper, cd);
 }
 
 static int ccu_div_set_rate(struct clk_hw *hw, unsigned long rate,

diff --git a/drivers/clk/sunxi-ng/ccu_mp.c b/drivers/clk/sunxi-ng/ccu_mp.c
index 4221b1888b38da22c16c90796abe6ffab9dc6291..7cdb0eedc69b53aacc8bfb54e309f2013821377b 100644 (file)
--- a/drivers/clk/sunxi-ng/ccu_mp.c
+++ b/drivers/clk/sunxi-ng/ccu_mp.c
@@ -103,11 +103,9 @@ static unsigned long ccu_mp_find_best_with_parent_adj(struct clk_hw *hw,
        return best_rate;
 }
 
-static unsigned long ccu_mp_round_rate(struct ccu_mux_internal *mux,
-                                      struct clk_hw *hw,
-                                      unsigned long *parent_rate,
-                                      unsigned long rate,
-                                      void *data)
+static int ccu_mp_determine_rate_helper(struct ccu_mux_internal *mux,
+                                       struct clk_rate_request *req,
+                                       void *data)
 {
        struct ccu_mp *cmp = data;
        unsigned int max_m, max_p;
@@ -115,7 +113,7 @@ static unsigned long ccu_mp_round_rate(struct ccu_mux_internal *mux,
        bool shift = true;
 
        if (cmp->common.features & CCU_FEATURE_FIXED_POSTDIV)
-               rate *= cmp->fixed_post_div;
+               req->rate *= cmp->fixed_post_div;
 
        if (cmp->common.features & CCU_FEATURE_DUAL_DIV)
                shift = false;
@@ -127,17 +125,19 @@ static unsigned long ccu_mp_round_rate(struct ccu_mux_internal *mux,
                max_p = cmp->p.max ?: 1 << cmp->p.width;
 
        if (!clk_hw_can_set_rate_parent(&cmp->common.hw)) {
-               rate = ccu_mp_find_best(*parent_rate, rate, max_m, max_p, shift,
-                                       &m, &p);
+               req->rate = ccu_mp_find_best(req->best_parent_rate, req->rate,
+                                            max_m, max_p, shift, &m, &p);
        } else {
-               rate = ccu_mp_find_best_with_parent_adj(hw, parent_rate, rate,
-                                                       max_m, max_p, shift);
+               req->rate = ccu_mp_find_best_with_parent_adj(req->best_parent_hw,
+                                                            &req->best_parent_rate,
+                                                            req->rate, max_m, max_p,
+                                                            shift);
        }
 
        if (cmp->common.features & CCU_FEATURE_FIXED_POSTDIV)
-               rate /= cmp->fixed_post_div;
+               req->rate /= cmp->fixed_post_div;
 
-       return rate;
+       return 0;
 }
 
 static void ccu_mp_disable(struct clk_hw *hw)
@@ -201,7 +201,7 @@ static int ccu_mp_determine_rate(struct clk_hw *hw,
        struct ccu_mp *cmp = hw_to_ccu_mp(hw);
 
        return ccu_mux_helper_determine_rate(&cmp->common, &cmp->mux,
-                                            req, ccu_mp_round_rate, cmp);
+                                            req, ccu_mp_determine_rate_helper, cmp);
 }
 
 static int ccu_mp_set_rate(struct clk_hw *hw, unsigned long rate,

diff --git a/drivers/clk/sunxi-ng/ccu_mult.c b/drivers/clk/sunxi-ng/ccu_mult.c
index 8d5720f3dec1d4eb34bf22166277fdf5a270da42..3fc81e7de6e93d3b8efa1debe08566860617c166 100644 (file)
--- a/drivers/clk/sunxi-ng/ccu_mult.c
+++ b/drivers/clk/sunxi-ng/ccu_mult.c
@@ -29,11 +29,9 @@ static void ccu_mult_find_best(unsigned long parent, unsigned long rate,
        mult->mult = _mult;
 }
 
-static unsigned long ccu_mult_round_rate(struct ccu_mux_internal *mux,
-                                        struct clk_hw *parent,
-                                        unsigned long *parent_rate,
-                                        unsigned long rate,
-                                        void *data)
+static int ccu_mult_determine_rate_helper(struct ccu_mux_internal *mux,
+                                         struct clk_rate_request *req,
+                                         void *data)
 {
        struct ccu_mult *cm = data;
        struct _ccu_mult _cm;
@@ -45,9 +43,11 @@ static unsigned long ccu_mult_round_rate(struct ccu_mux_internal *mux,
        else
                _cm.max = (1 << cm->mult.width) + cm->mult.offset - 1;
 
-       ccu_mult_find_best(*parent_rate, rate, &_cm);
+       ccu_mult_find_best(req->best_parent_rate, req->rate, &_cm);
 
-       return *parent_rate * _cm.mult;
+       req->rate = req->best_parent_rate * _cm.mult;
+
+       return 0;
 }
 
 static void ccu_mult_disable(struct clk_hw *hw)
@@ -97,7 +97,7 @@ static int ccu_mult_determine_rate(struct clk_hw *hw,
        struct ccu_mult *cm = hw_to_ccu_mult(hw);
 
        return ccu_mux_helper_determine_rate(&cm->common, &cm->mux,
-                                            req, ccu_mult_round_rate, cm);
+                                            req, ccu_mult_determine_rate_helper, cm);
 }
 
 static int ccu_mult_set_rate(struct clk_hw *hw, unsigned long rate,

diff --git a/drivers/clk/sunxi-ng/ccu_mux.c b/drivers/clk/sunxi-ng/ccu_mux.c
index 74f9e98a5d355d6a26b1655c25e9e48da1f6f10d..766f27cff748edca73ccee610ce1e814600e6404 100644 (file)
--- a/drivers/clk/sunxi-ng/ccu_mux.c
+++ b/drivers/clk/sunxi-ng/ccu_mux.c
@@ -79,41 +79,46 @@ static unsigned long ccu_mux_helper_unapply_prediv(struct ccu_common *common,
 int ccu_mux_helper_determine_rate(struct ccu_common *common,
                                  struct ccu_mux_internal *cm,
                                  struct clk_rate_request *req,
-                                 unsigned long (*round)(struct ccu_mux_internal *,
-                                                        struct clk_hw *,
-                                                        unsigned long *,
-                                                        unsigned long,
-                                                        void *),
+                                 int (*round)(struct ccu_mux_internal *,
+                                              struct clk_rate_request *,
+                                              void *),
                                  void *data)
 {
        unsigned long best_parent_rate = 0, best_rate = 0;
        struct clk_hw *best_parent, *hw = &common->hw;
        unsigned int i;
+       int ret;
 
        if (clk_hw_get_flags(hw) & CLK_SET_RATE_NO_REPARENT) {
-               unsigned long adj_parent_rate;
+               struct clk_rate_request adj_req = *req;
 
                best_parent = clk_hw_get_parent(hw);
                best_parent_rate = clk_hw_get_rate(best_parent);
-               adj_parent_rate = ccu_mux_helper_apply_prediv(common, cm, -1,
-                                                             best_parent_rate);
 
-               best_rate = round(cm, best_parent, &adj_parent_rate,
-                                 req->rate, data);
+               adj_req.best_parent_hw = best_parent;
+               adj_req.best_parent_rate = ccu_mux_helper_apply_prediv(common, cm, -1,
+                                                                      best_parent_rate);
+
+               ret = round(cm, &adj_req, data);
+               if (ret)
+                       return ret;
+
+               best_rate = adj_req.rate;
 
                /*
-                * adj_parent_rate might have been modified by our clock.
+                * best_parent_rate might have been modified by our clock.
                 * Unapply the pre-divider if there's one, and give
                 * the actual frequency the parent needs to run at.
                 */
                best_parent_rate = ccu_mux_helper_unapply_prediv(common, cm, -1,
-                                                                adj_parent_rate);
+                                                                adj_req.best_parent_rate);
 
                goto out;
        }
 
        for (i = 0; i < clk_hw_get_num_parents(hw); i++) {
-               unsigned long tmp_rate, parent_rate;
+               struct clk_rate_request tmp_req = *req;
+               unsigned long parent_rate;
                struct clk_hw *parent;
 
                parent = clk_hw_get_parent_by_index(hw, i);
@@ -123,7 +128,12 @@ int ccu_mux_helper_determine_rate(struct ccu_common *common,
                parent_rate = ccu_mux_helper_apply_prediv(common, cm, i,
                                                          clk_hw_get_rate(parent));
 
-               tmp_rate = round(cm, parent, &parent_rate, req->rate, data);
+               tmp_req.best_parent_hw = parent;
+               tmp_req.best_parent_rate = parent_rate;
+
+               ret = round(cm, &tmp_req, data);
+               if (ret)
+                       continue;
 
                /*
                 * parent_rate might have been modified by our clock.
@@ -131,16 +141,17 @@ int ccu_mux_helper_determine_rate(struct ccu_common *common,
                 * the actual frequency the parent needs to run at.
                 */
                parent_rate = ccu_mux_helper_unapply_prediv(common, cm, i,
-                                                           parent_rate);
-               if (tmp_rate == req->rate) {
+                                                           tmp_req.best_parent_rate);
+
+               if (tmp_req.rate == req->rate) {
                        best_parent = parent;
                        best_parent_rate = parent_rate;
-                       best_rate = tmp_rate;
+                       best_rate = tmp_req.rate;
                        goto out;
                }
 
-               if (ccu_is_better_rate(common, req->rate, tmp_rate, best_rate)) {
-                       best_rate = tmp_rate;
+               if (ccu_is_better_rate(common, req->rate, tmp_req.rate, best_rate)) {
+                       best_rate = tmp_req.rate;
                        best_parent_rate = parent_rate;
                        best_parent = parent;
                }

diff --git a/drivers/clk/sunxi-ng/ccu_mux.h b/drivers/clk/sunxi-ng/ccu_mux.h
index eb1172ebbd94b5e3515f618390a4753c7eb5be4d..c94a4bde5d01604ac2b317babd4368151d0d08ab 100644 (file)
--- a/drivers/clk/sunxi-ng/ccu_mux.h
+++ b/drivers/clk/sunxi-ng/ccu_mux.h
@@ -137,11 +137,9 @@ unsigned long ccu_mux_helper_apply_prediv(struct ccu_common *common,
 int ccu_mux_helper_determine_rate(struct ccu_common *common,
                                  struct ccu_mux_internal *cm,
                                  struct clk_rate_request *req,
-                                 unsigned long (*round)(struct ccu_mux_internal *,
-                                                        struct clk_hw *,
-                                                        unsigned long *,
-                                                        unsigned long,
-                                                        void *),
+                                 int (*round)(struct ccu_mux_internal *,
+                                              struct clk_rate_request *,
+                                              void *),
                                  void *data);
 u8 ccu_mux_helper_get_parent(struct ccu_common *common,
                             struct ccu_mux_internal *cm);

diff --git a/drivers/clk/sunxi-ng/ccu_nkm.c b/drivers/clk/sunxi-ng/ccu_nkm.c
index 784eec9ac9979b22e8f384e0abbb5c1a381ae953..401fbb752479b787092c53dfd870692e9eb70dba 100644 (file)
--- a/drivers/clk/sunxi-ng/ccu_nkm.c
+++ b/drivers/clk/sunxi-ng/ccu_nkm.c
@@ -162,11 +162,9 @@ static unsigned long ccu_nkm_recalc_rate(struct clk_hw *hw,
        return rate;
 }
 
-static unsigned long ccu_nkm_round_rate(struct ccu_mux_internal *mux,
-                                       struct clk_hw *parent_hw,
-                                       unsigned long *parent_rate,
-                                       unsigned long rate,
-                                       void *data)
+static int ccu_nkm_determine_rate_helper(struct ccu_mux_internal *mux,
+                                        struct clk_rate_request *req,
+                                        void *data)
 {
        struct ccu_nkm *nkm = data;
        struct _ccu_nkm _nkm;
@@ -179,18 +177,21 @@ static unsigned long ccu_nkm_round_rate(struct ccu_mux_internal *mux,
        _nkm.max_m = nkm->m.max ?: 1 << nkm->m.width;
 
        if (nkm->common.features & CCU_FEATURE_FIXED_POSTDIV)
-               rate *= nkm->fixed_post_div;
+               req->rate *= nkm->fixed_post_div;
 
        if (!clk_hw_can_set_rate_parent(&nkm->common.hw))
-               rate = ccu_nkm_find_best(*parent_rate, rate, &_nkm, &nkm->common);
+               req->rate = ccu_nkm_find_best(req->best_parent_rate, req->rate,
+                                             &_nkm, &nkm->common);
        else
-               rate = ccu_nkm_find_best_with_parent_adj(&nkm->common, parent_hw, parent_rate, rate,
-                                                        &_nkm);
+               req->rate = ccu_nkm_find_best_with_parent_adj(&nkm->common,
+                                                             req->best_parent_hw,
+                                                             &req->best_parent_rate,
+                                                             req->rate, &_nkm);
 
        if (nkm->common.features & CCU_FEATURE_FIXED_POSTDIV)
-               rate /= nkm->fixed_post_div;
+               req->rate /= nkm->fixed_post_div;
 
-       return rate;
+       return 0;
 }
 
 static int ccu_nkm_determine_rate(struct clk_hw *hw,
@@ -199,7 +200,7 @@ static int ccu_nkm_determine_rate(struct clk_hw *hw,
        struct ccu_nkm *nkm = hw_to_ccu_nkm(hw);
 
        return ccu_mux_helper_determine_rate(&nkm->common, &nkm->mux,
-                                            req, ccu_nkm_round_rate, nkm);
+                                            req, ccu_nkm_determine_rate_helper, nkm);
 }
 
 static int ccu_nkm_set_rate(struct clk_hw *hw, unsigned long rate,