mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-01-11 01:04:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

clk: qcom: krait-cc: convert to devm_clk_hw_register

Browse Source 
clk_register is now deprecated. Convert the driver to devm_clk_hw_register.

Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20221109005631.3189-4-ansuelsmth@gmail.com
This commit is contained in:
Christian Marangi
2022-11-09 01:56:30 +01:00
committed by Bjorn Andersson
parent e5dc1a4c01
commit 8ea9fb841a
1 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/clk/qcom/krait-cc.c
View File

@@ -79,8 +79,7 @@ krait_add_div(struct device *dev, int id, const char *s, unsigned int offset)
.flags = CLK_SET_RATE_PARENT,
};
const char *p_names[1];
struct clk *clk;
int cpu;
int cpu, ret;
div = devm_kzalloc(dev, sizeof(*div), GFP_KERNEL);
if (!div)
@@ -103,8 +102,8 @@ krait_add_div(struct device *dev, int id, const char *s, unsigned int offset)
return -ENOMEM;
}
clk = devm_clk_register(dev, &div->hw);
if (IS_ERR(clk))
ret = devm_clk_hw_register(dev, &div->hw);
if (ret)
goto err;
/* clk-krait ignore any rate change if mux is not flagged as enabled */
@@ -118,7 +117,7 @@ krait_add_div(struct device *dev, int id, const char *s, unsigned int offset)
kfree(p_names[0]);
kfree(init.name);
return PTR_ERR_OR_ZERO(clk);
return ret;
}
static int
@@ -137,7 +136,6 @@ krait_add_sec_mux(struct device *dev, int id, const char *s,
.ops = &krait_mux_clk_ops,
.flags = CLK_SET_RATE_PARENT,
};
struct clk *clk;
mux = devm_kzalloc(dev, sizeof(*mux), GFP_KERNEL);
if (!mux)
@@ -166,14 +164,16 @@ krait_add_sec_mux(struct device *dev, int id, const char *s,
if (unique_aux) {
sec_mux_list[0] = kasprintf(GFP_KERNEL, "acpu%s_aux", s);
if (!sec_mux_list[0]) {
clk = ERR_PTR(-ENOMEM);
ret = -ENOMEM;
goto err_aux;
}
}
clk = devm_clk_register(dev, &mux->hw);
ret = devm_clk_hw_register(dev, &mux->hw);
if (ret)
goto unique_aux;
ret = krait_notifier_register(dev, clk, mux);
ret = krait_notifier_register(dev, mux->hw.clk, mux);
if (ret)
goto unique_aux;
@@ -189,7 +189,7 @@ krait_add_sec_mux(struct device *dev, int id, const char *s,
kfree(sec_mux_list[0]);
err_aux:
kfree(init.name);
return PTR_ERR_OR_ZERO(clk);
return ret;
}
static struct clk *
@@ -241,11 +241,18 @@ krait_add_pri_mux(struct device *dev, int id, const char *s,
goto err_p2;
}
clk = devm_clk_register(dev, &mux->hw);
ret = devm_clk_hw_register(dev, &mux->hw);
if (ret) {
clk = ERR_PTR(ret);
goto err_p3;
}
clk = mux->hw.clk;
ret = krait_notifier_register(dev, clk, mux);
if (ret)
goto err_p3;
clk = ERR_PTR(ret);
err_p3:
kfree(p_names[2]);
err_p2: