clk: at91: Migrate to clk_hw based registration and OF APIs

[cascardo/linux.git] / drivers / clk / at91 / clk-master.c

diff --git a/drivers/clk/at91/clk-master.c b/drivers/clk/at91/clk-master.c
index d1021e1..e9cba9f 100644 (file)
--- a/drivers/clk/at91/clk-master.c
+++ b/drivers/clk/at91/clk-master.c
@@ -120,7 +120,7 @@ static const struct clk_ops master_ops = {
        .get_parent = clk_master_get_parent,
 };
 
-static struct clk * __init
+static struct clk_hw * __init
 at91_clk_register_master(struct regmap *regmap,
                const char *name, int num_parents,
                const char **parent_names,
@@ -128,8 +128,9 @@ at91_clk_register_master(struct regmap *regmap,
                const struct clk_master_characteristics *characteristics)
 {
        struct clk_master *master;
-       struct clk *clk = NULL;
        struct clk_init_data init;
+       struct clk_hw *hw;
+       int ret;
 
        if (!name || !num_parents || !parent_names)
                return ERR_PTR(-EINVAL);
@@ -149,12 +150,14 @@ at91_clk_register_master(struct regmap *regmap,
        master->characteristics = characteristics;
        master->regmap = regmap;
 
-       clk = clk_register(NULL, &master->hw);
-       if (IS_ERR(clk)) {
+       hw = &master->hw;
+       ret = clk_hw_register(NULL, &master->hw);
+       if (ret) {
                kfree(master);
+               hw = ERR_PTR(ret);
        }
 
-       return clk;
+       return hw;
 }
 
 
@@ -198,7 +201,7 @@ static void __init
 of_at91_clk_master_setup(struct device_node *np,
                         const struct clk_master_layout *layout)
 {
-       struct clk *clk;
+       struct clk_hw *hw;
        unsigned int num_parents;
        const char *parent_names[MASTER_SOURCE_MAX];
        const char *name = np->name;
@@ -221,13 +224,13 @@ of_at91_clk_master_setup(struct device_node *np,
        if (IS_ERR(regmap))
                return;
 
-       clk = at91_clk_register_master(regmap, name, num_parents,
+       hw = at91_clk_register_master(regmap, name, num_parents,
                                       parent_names, layout,
                                       characteristics);
-       if (IS_ERR(clk))
+       if (IS_ERR(hw))
                goto out_free_characteristics;
 
-       of_clk_add_provider(np, of_clk_src_simple_get, clk);
+       of_clk_add_hw_provider(np, of_clk_hw_simple_get, hw);
        return;
 
 out_free_characteristics: