These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / clk / berlin / berlin2-pll.c

diff --git a/kernel/drivers/clk/berlin/berlin2-pll.c b/kernel/drivers/clk/berlin/berlin2-pll.c
index bdc506b..1c2294d 100644 (file)
--- a/kernel/drivers/clk/berlin/berlin2-pll.c
+++ b/kernel/drivers/clk/berlin/berlin2-pll.c
@@ -25,14 +25,7 @@
 #include <asm/div64.h>
 
 #include "berlin2-div.h"
-
-struct berlin2_pll_map {
-       const u8 vcodiv[16];
-       u8 mult;
-       u8 fbdiv_shift;
-       u8 rfdiv_shift;
-       u8 divsel_shift;
-};
+#include "berlin2-pll.h"
 
 struct berlin2_pll {
        struct clk_hw hw;
@@ -68,7 +61,7 @@ berlin2_pll_recalc_rate(struct clk_hw *hw, unsigned long parent_rate)
        fbdiv = (val >> map->fbdiv_shift) & FBDIV_MASK;
        rfdiv = (val >> map->rfdiv_shift) & RFDIV_MASK;
        if (rfdiv == 0) {
-               pr_warn("%s has zero rfdiv\n", __clk_get_name(hw->clk));
+               pr_warn("%s has zero rfdiv\n", clk_hw_get_name(hw));
                rfdiv = 1;
        }
 
@@ -77,7 +70,7 @@ berlin2_pll_recalc_rate(struct clk_hw *hw, unsigned long parent_rate)
        vcodiv = map->vcodiv[vcodivsel];
        if (vcodiv == 0) {
                pr_warn("%s has zero vcodiv (index %d)\n",
-                       __clk_get_name(hw->clk), vcodivsel);
+                       clk_hw_get_name(hw), vcodivsel);
                vcodiv = 1;
        }