Merge remote-tracking branch 'clk/clk-next'

[deliverable/linux.git] / drivers / clk / berlin / berlin2-pll.c

diff --git a/drivers/clk/berlin/berlin2-pll.c b/drivers/clk/berlin/berlin2-pll.c
index 1c2294d3ba85a449a7415c034a287045d703dc83..4ffbe80f63232c71fb6ba1cd2b28c2da6f0ca877 100644 (file)
--- a/drivers/clk/berlin/berlin2-pll.c
+++ b/drivers/clk/berlin/berlin2-pll.c
@@ -84,7 +84,7 @@ static const struct clk_ops berlin2_pll_ops = {
        .recalc_rate    = berlin2_pll_recalc_rate,
 };
 
-struct clk * __init
+int __init
 berlin2_pll_register(const struct berlin2_pll_map *map,
                     void __iomem *base, const char *name,
                     const char *parent_name, unsigned long flags)
@@ -94,7 +94,7 @@ berlin2_pll_register(const struct berlin2_pll_map *map,
 
        pll = kzalloc(sizeof(*pll), GFP_KERNEL);
        if (!pll)
-               return ERR_PTR(-ENOMEM);
+               return -ENOMEM;
 
        /* copy pll_map to allow __initconst */
        memcpy(&pll->map, map, sizeof(*map));
@@ -106,5 +106,5 @@ berlin2_pll_register(const struct berlin2_pll_map *map,
        init.num_parents = 1;
        init.flags = flags;
 
-       return clk_register(NULL, &pll->hw);
+       return clk_hw_register(NULL, &pll->hw);
 }