Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

clk: max77686: Refactor driver data handling

Browse source 
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>
This commit is contained in:
Tomasz Figa 2013-12-12 17:07:19 +01:00 committed by Mike Turquette
parent d73ac4ca66
commit 3966c947f4
1 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
drivers/clk/clk-max77686.c
View file

@ -137,12 +137,13 @@ static struct clk *max77686_clk_register(struct device *dev,
static int max77686_clk_probe(struct platform_device *pdev) static int max77686_clk_probe(struct platform_device *pdev)
{ {
struct max77686_dev *iodev = dev_get_drvdata(pdev->dev.parent); 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; 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); * MAX77686_CLKS_NUM, GFP_KERNEL);
if (!max77686_clks) if (!clocks)
return -ENOMEM; return -ENOMEM;
for (i = 0; i < MAX77686_CLKS_NUM; i++) { 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++) { for (i = 0; i < MAX77686_CLKS_NUM; i++) {
struct clk *clk;
max77686_clks[i]->iodev = iodev; max77686_clks[i]->iodev = iodev;
max77686_clks[i]->mask = 1 << i; max77686_clks[i]->mask = 1 << i;
max77686_clks[i]->hw.init = &max77686_clks_init[i]; max77686_clks[i]->hw.init = &max77686_clks_init[i];
clk = max77686_clk_register(&pdev->dev, max77686_clks[i]); clocks[i] = max77686_clk_register(&pdev->dev, max77686_clks[i]);
if (IS_ERR(clk)) { if (IS_ERR(clocks[i])) {
ret = PTR_ERR(clk); ret = PTR_ERR(clocks[i]);
dev_err(&pdev->dev, "failed to register %s\n", dev_err(&pdev->dev, "failed to register %s\n",
max77686_clks[i]->hw.init->name); max77686_clks[i]->hw.init->name);
goto err_clocks; goto err_clocks;
} }
} }
platform_set_drvdata(pdev, max77686_clks); platform_set_drvdata(pdev, clocks);
return 0; return 0;
@ -184,12 +182,15 @@ static int max77686_clk_probe(struct platform_device *pdev)
static int max77686_clk_remove(struct platform_device *pdev) 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; int i;
for (i = 0; i < MAX77686_CLKS_NUM; i++) { for (i = 0; i < MAX77686_CLKS_NUM; i++) {
clkdev_drop(max77686_clks[i]->lookup); struct clk_hw *hw = __clk_get_hw(clocks[i]);
clk_unregister(max77686_clks[i]->hw.clk); struct max77686_clk *max77686 = to_max77686_clk(hw);
clkdev_drop(max77686->lookup);
clk_unregister(clocks[i]);
} }
return 0; return 0;
} }