Commit badbc542 authored by Tomasz Figa's avatar Tomasz Figa Committed by Mike Turquette

clk: max77686: Make max77686_clk_register() return struct clk *

As a preparation for further patches, this patch modifies the clock
registration helper function to return a pointer to the newly registered
clock. No functional change is done to the driver.
Signed-off-by: default avatarTomasz Figa <t.figa@samsung.com>
Acked-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarMike Turquette <mturquette@linaro.org>
parent b0f85177
...@@ -112,27 +112,26 @@ static struct clk_init_data max77686_clks_init[MAX77686_CLKS_NUM] = { ...@@ -112,27 +112,26 @@ static struct clk_init_data max77686_clks_init[MAX77686_CLKS_NUM] = {
}, },
}; };
static int max77686_clk_register(struct device *dev, static struct clk *max77686_clk_register(struct device *dev,
struct max77686_clk *max77686) struct max77686_clk *max77686)
{ {
struct clk *clk; struct clk *clk;
struct clk_hw *hw = &max77686->hw; struct clk_hw *hw = &max77686->hw;
clk = clk_register(dev, hw); clk = clk_register(dev, hw);
if (IS_ERR(clk)) if (IS_ERR(clk))
return -ENOMEM; return clk;
max77686->lookup = kzalloc(sizeof(struct clk_lookup), GFP_KERNEL); max77686->lookup = kzalloc(sizeof(struct clk_lookup), GFP_KERNEL);
if (!max77686->lookup) if (!max77686->lookup)
return -ENOMEM; return ERR_PTR(-ENOMEM);
max77686->lookup->con_id = hw->init->name; max77686->lookup->con_id = hw->init->name;
max77686->lookup->clk = clk; max77686->lookup->clk = clk;
clkdev_add(max77686->lookup); clkdev_add(max77686->lookup);
return 0; return clk;
} }
static int max77686_clk_probe(struct platform_device *pdev) static int max77686_clk_probe(struct platform_device *pdev)
...@@ -154,12 +153,16 @@ static int max77686_clk_probe(struct platform_device *pdev) ...@@ -154,12 +153,16 @@ 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];
ret = max77686_clk_register(&pdev->dev, max77686_clks[i]); clk = max77686_clk_register(&pdev->dev, max77686_clks[i]);
if (ret) { if (IS_ERR(clk)) {
ret = PTR_ERR(clk);
switch (i) { switch (i) {
case MAX77686_CLK_AP: case MAX77686_CLK_AP:
dev_err(&pdev->dev, "Fail to register CLK_AP\n"); dev_err(&pdev->dev, "Fail to register CLK_AP\n");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment