summaryrefslogtreecommitdiff
path: root/drivers/clk/clk-max77686.c
diff options
context:
space:
mode:
authorTomasz Figa <t.figa@samsung.com>2013-12-12 20:07:19 +0400
committerMike Turquette <mturquette@linaro.org>2014-01-08 21:57:07 +0400
commit3966c947f45911e093114371462687134d5e8d40 (patch)
treed83e0faef3d02d6fd89aeca672794ac9ad7f3b22 /drivers/clk/clk-max77686.c
parentd73ac4ca66676d0b0d57a8828d10d479ad054d0c (diff)
downloadlinux-3966c947f45911e093114371462687134d5e8d40.tar.xz
clk: max77686: Refactor driver data handling
As a prerequisite for further patch adding OF clock provider support to the driver, this patch changes the driver to store an array of struct clk * as driver data. Signed-off-by: Tomasz Figa <t.figa@samsung.com> Acked-by: Kyungmin Park <kyungmin.park@samsung.com> Signed-off-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'drivers/clk/clk-max77686.c')
-rw-r--r--drivers/clk/clk-max77686.c27
1 files changed, 14 insertions, 13 deletions
diff --git a/drivers/clk/clk-max77686.c b/drivers/clk/clk-max77686.c
index 4dc1832fe241..3cf38dc66379 100644
--- a/drivers/clk/clk-max77686.c
+++ b/drivers/clk/clk-max77686.c
@@ -137,12 +137,13 @@ static struct clk *max77686_clk_register(struct device *dev,
static int max77686_clk_probe(struct platform_device *pdev)
{
struct max77686_dev *iodev = dev_get_drvdata(pdev->dev.parent);
- struct max77686_clk **max77686_clks;
+ struct max77686_clk *max77686_clks[MAX77686_CLKS_NUM];
+ struct clk **clocks;
int i, ret;
- max77686_clks = devm_kzalloc(&pdev->dev, sizeof(struct max77686_clk *)
+ clocks = devm_kzalloc(&pdev->dev, sizeof(struct clk *)
* MAX77686_CLKS_NUM, GFP_KERNEL);
- if (!max77686_clks)
+ if (!clocks)
return -ENOMEM;
for (i = 0; i < MAX77686_CLKS_NUM; i++) {
@@ -153,23 +154,20 @@ static int max77686_clk_probe(struct platform_device *pdev)
}
for (i = 0; i < MAX77686_CLKS_NUM; i++) {
- struct clk *clk;
-
max77686_clks[i]->iodev = iodev;
max77686_clks[i]->mask = 1 << i;
max77686_clks[i]->hw.init = &max77686_clks_init[i];
- clk = max77686_clk_register(&pdev->dev, max77686_clks[i]);
- if (IS_ERR(clk)) {
- ret = PTR_ERR(clk);
-
+ clocks[i] = max77686_clk_register(&pdev->dev, max77686_clks[i]);
+ if (IS_ERR(clocks[i])) {
+ ret = PTR_ERR(clocks[i]);
dev_err(&pdev->dev, "failed to register %s\n",
max77686_clks[i]->hw.init->name);
goto err_clocks;
}
}
- platform_set_drvdata(pdev, max77686_clks);
+ platform_set_drvdata(pdev, clocks);
return 0;
@@ -184,12 +182,15 @@ err_clocks:
static int max77686_clk_remove(struct platform_device *pdev)
{
- struct max77686_clk **max77686_clks = platform_get_drvdata(pdev);
+ struct clk **clocks = platform_get_drvdata(pdev);
int i;
for (i = 0; i < MAX77686_CLKS_NUM; i++) {
- clkdev_drop(max77686_clks[i]->lookup);
- clk_unregister(max77686_clks[i]->hw.clk);
+ struct clk_hw *hw = __clk_get_hw(clocks[i]);
+ struct max77686_clk *max77686 = to_max77686_clk(hw);
+
+ clkdev_drop(max77686->lookup);
+ clk_unregister(clocks[i]);
}
return 0;
}