mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-05-24 10:39:52 +00:00
clk: s2mps11: Add missing of_node_put and of_clk_del_provider
Add of_clk_del_provider to remove previously registered clock provider. Add of_node_put to decrement the ref count of clock nodes. Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Signed-off-by: Mike Turquette <mturquette@linaro.org>
This commit is contained in:
parent
42dd880e67
commit
bf416bd457
1 changed files with 11 additions and 5 deletions
|
@ -44,6 +44,7 @@ enum {
|
||||||
|
|
||||||
struct s2mps11_clk {
|
struct s2mps11_clk {
|
||||||
struct sec_pmic_dev *iodev;
|
struct sec_pmic_dev *iodev;
|
||||||
|
struct device_node *clk_np;
|
||||||
struct clk_hw hw;
|
struct clk_hw hw;
|
||||||
struct clk *clk;
|
struct clk *clk;
|
||||||
struct clk_lookup *lookup;
|
struct clk_lookup *lookup;
|
||||||
|
@ -156,7 +157,6 @@ static int s2mps11_clk_probe(struct platform_device *pdev)
|
||||||
{
|
{
|
||||||
struct sec_pmic_dev *iodev = dev_get_drvdata(pdev->dev.parent);
|
struct sec_pmic_dev *iodev = dev_get_drvdata(pdev->dev.parent);
|
||||||
struct s2mps11_clk *s2mps11_clks, *s2mps11_clk;
|
struct s2mps11_clk *s2mps11_clks, *s2mps11_clk;
|
||||||
struct device_node *clk_np = NULL;
|
|
||||||
unsigned int s2mps11_reg;
|
unsigned int s2mps11_reg;
|
||||||
int i, ret = 0;
|
int i, ret = 0;
|
||||||
u32 val;
|
u32 val;
|
||||||
|
@ -168,9 +168,10 @@ static int s2mps11_clk_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
s2mps11_clk = s2mps11_clks;
|
s2mps11_clk = s2mps11_clks;
|
||||||
|
|
||||||
clk_np = s2mps11_clk_parse_dt(pdev);
|
/* Store clocks of_node in first element of s2mps11_clks array */
|
||||||
if (IS_ERR(clk_np))
|
s2mps11_clks->clk_np = s2mps11_clk_parse_dt(pdev);
|
||||||
return PTR_ERR(clk_np);
|
if (IS_ERR(s2mps11_clks->clk_np))
|
||||||
|
return PTR_ERR(s2mps11_clks->clk_np);
|
||||||
|
|
||||||
switch(platform_get_device_id(pdev)->driver_data) {
|
switch(platform_get_device_id(pdev)->driver_data) {
|
||||||
case S2MPS11X:
|
case S2MPS11X:
|
||||||
|
@ -225,7 +226,8 @@ static int s2mps11_clk_probe(struct platform_device *pdev)
|
||||||
|
|
||||||
clk_data.clks = clk_table;
|
clk_data.clks = clk_table;
|
||||||
clk_data.clk_num = S2MPS11_CLKS_NUM;
|
clk_data.clk_num = S2MPS11_CLKS_NUM;
|
||||||
of_clk_add_provider(clk_np, of_clk_src_onecell_get, &clk_data);
|
of_clk_add_provider(s2mps11_clks->clk_np,
|
||||||
|
of_clk_src_onecell_get, &clk_data);
|
||||||
}
|
}
|
||||||
|
|
||||||
platform_set_drvdata(pdev, s2mps11_clks);
|
platform_set_drvdata(pdev, s2mps11_clks);
|
||||||
|
@ -250,6 +252,10 @@ static int s2mps11_clk_remove(struct platform_device *pdev)
|
||||||
struct s2mps11_clk *s2mps11_clks = platform_get_drvdata(pdev);
|
struct s2mps11_clk *s2mps11_clks = platform_get_drvdata(pdev);
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
of_clk_del_provider(s2mps11_clks[0].clk_np);
|
||||||
|
/* Drop the reference obtained in s2mps11_clk_parse_dt */
|
||||||
|
of_node_put(s2mps11_clks[0].clk_np);
|
||||||
|
|
||||||
for (i = 0; i < S2MPS11_CLKS_NUM; i++)
|
for (i = 0; i < S2MPS11_CLKS_NUM; i++)
|
||||||
clkdev_drop(s2mps11_clks[i].lookup);
|
clkdev_drop(s2mps11_clks[i].lookup);
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue