Merge tag 'for-linus-4.3-rc0b-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / drivers / clk / clk-si5351.c

diff --git a/drivers/clk/clk-si5351.c b/drivers/clk/clk-si5351.c
index e39e1e680b3c6c09b117e7a32a35b7d1a808bf37..5596c0aac22f8f4f1a639d6e3cf01ad92c7e0df4 100644 (file)
--- a/drivers/clk/clk-si5351.c
+++ b/drivers/clk/clk-si5351.c
@@ -18,7 +18,7 @@
 
 #include <linux/module.h>
 #include <linux/kernel.h>
-#include <linux/clkdev.h>
+#include <linux/clk.h>
 #include <linux/clk-provider.h>
 #include <linux/delay.h>
 #include <linux/err.h>
@@ -439,7 +439,7 @@ static unsigned long si5351_pll_recalc_rate(struct clk_hw *hw,
 
        dev_dbg(&hwdata->drvdata->client->dev,
                "%s - %s: p1 = %lu, p2 = %lu, p3 = %lu, parent_rate = %lu, rate = %lu\n",
-               __func__, __clk_get_name(hwdata->hw.clk),
+               __func__, clk_hw_get_name(hw),
                hwdata->params.p1, hwdata->params.p2, hwdata->params.p3,
                parent_rate, (unsigned long)rate);
 
@@ -497,7 +497,7 @@ static long si5351_pll_round_rate(struct clk_hw *hw, unsigned long rate,
 
        dev_dbg(&hwdata->drvdata->client->dev,
                "%s - %s: a = %lu, b = %lu, c = %lu, parent_rate = %lu, rate = %lu\n",
-               __func__, __clk_get_name(hwdata->hw.clk), a, b, c,
+               __func__, clk_hw_get_name(hw), a, b, c,
                *parent_rate, rate);
 
        return rate;
@@ -521,7 +521,7 @@ static int si5351_pll_set_rate(struct clk_hw *hw, unsigned long rate,
 
        dev_dbg(&hwdata->drvdata->client->dev,
                "%s - %s: p1 = %lu, p2 = %lu, p3 = %lu, parent_rate = %lu, rate = %lu\n",
-               __func__, __clk_get_name(hwdata->hw.clk),
+               __func__, clk_hw_get_name(hw),
                hwdata->params.p1, hwdata->params.p2, hwdata->params.p3,
                parent_rate, rate);
 
@@ -632,7 +632,7 @@ static unsigned long si5351_msynth_recalc_rate(struct clk_hw *hw,
 
        dev_dbg(&hwdata->drvdata->client->dev,
                "%s - %s: p1 = %lu, p2 = %lu, p3 = %lu, m = %lu, parent_rate = %lu, rate = %lu\n",
-               __func__, __clk_get_name(hwdata->hw.clk),
+               __func__, clk_hw_get_name(hw),
                hwdata->params.p1, hwdata->params.p2, hwdata->params.p3,
                m, parent_rate, (unsigned long)rate);
 
@@ -663,7 +663,7 @@ static long si5351_msynth_round_rate(struct clk_hw *hw, unsigned long rate,
                divby4 = 1;
 
        /* multisync can set pll */
-       if (__clk_get_flags(hwdata->hw.clk) & CLK_SET_RATE_PARENT) {
+       if (clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT) {
                /*
                 * find largest integer divider for max
                 * vco frequency and given target rate
@@ -745,7 +745,7 @@ static long si5351_msynth_round_rate(struct clk_hw *hw, unsigned long rate,
 
        dev_dbg(&hwdata->drvdata->client->dev,
                "%s - %s: a = %lu, b = %lu, c = %lu, divby4 = %d, parent_rate = %lu, rate = %lu\n",
-               __func__, __clk_get_name(hwdata->hw.clk), a, b, c, divby4,
+               __func__, clk_hw_get_name(hw), a, b, c, divby4,
                *parent_rate, rate);
 
        return rate;
@@ -777,7 +777,7 @@ static int si5351_msynth_set_rate(struct clk_hw *hw, unsigned long rate,
 
        dev_dbg(&hwdata->drvdata->client->dev,
                "%s - %s: p1 = %lu, p2 = %lu, p3 = %lu, divby4 = %d, parent_rate = %lu, rate = %lu\n",
-               __func__, __clk_get_name(hwdata->hw.clk),
+               __func__, clk_hw_get_name(hw),
                hwdata->params.p1, hwdata->params.p2, hwdata->params.p3,
                divby4, parent_rate, rate);
 
@@ -1013,7 +1013,7 @@ static long si5351_clkout_round_rate(struct clk_hw *hw, unsigned long rate,
                rate = SI5351_CLKOUT_MIN_FREQ;
 
        /* request frequency if multisync master */
-       if (__clk_get_flags(hwdata->hw.clk) & CLK_SET_RATE_PARENT) {
+       if (clk_hw_get_flags(hw) & CLK_SET_RATE_PARENT) {
                /* use r divider for frequencies below 1MHz */
                rdiv = SI5351_OUTPUT_CLK_DIV_1;
                while (rate < SI5351_MULTISYNTH_MIN_FREQ &&
@@ -1042,7 +1042,7 @@ static long si5351_clkout_round_rate(struct clk_hw *hw, unsigned long rate,
 
        dev_dbg(&hwdata->drvdata->client->dev,
                "%s - %s: rdiv = %u, parent_rate = %lu, rate = %lu\n",
-               __func__, __clk_get_name(hwdata->hw.clk), (1 << rdiv),
+               __func__, clk_hw_get_name(hw), (1 << rdiv),
                *parent_rate, rate);
 
        return rate;
@@ -1093,7 +1093,7 @@ static int si5351_clkout_set_rate(struct clk_hw *hw, unsigned long rate,
 
        dev_dbg(&hwdata->drvdata->client->dev,
                "%s - %s: rdiv = %u, parent_rate = %lu, rate = %lu\n",
-               __func__, __clk_get_name(hwdata->hw.clk), (1 << rdiv),
+               __func__, clk_hw_get_name(hw), (1 << rdiv),
                parent_rate, rate);
 
        return 0;