diff options
author | Tomasz Figa <t.figa@samsung.com> | 2013-08-23 18:59:40 +0200 |
---|---|---|
committer | Chanho Park <chanho61.park@samsung.com> | 2014-11-18 11:44:08 +0900 |
commit | cb5136cbe40b1b94c7fd806ef39baa863b88f761 (patch) | |
tree | 4591e5e885c775aafef57accaae44b13025d3bf9 | |
parent | d3048056499e462b9dad2e28b4512aad0e4c793a (diff) | |
download | linux-3.10-cb5136cbe40b1b94c7fd806ef39baa863b88f761.tar.gz linux-3.10-cb5136cbe40b1b94c7fd806ef39baa863b88f761.tar.bz2 linux-3.10-cb5136cbe40b1b94c7fd806ef39baa863b88f761.zip |
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: Tomasz Figa <t.figa@samsung.com>
-rw-r--r-- | drivers/clk/clk-max77686.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/drivers/clk/clk-max77686.c b/drivers/clk/clk-max77686.c index 5d78460461e..2e6ba0e9517 100644 --- a/drivers/clk/clk-max77686.c +++ b/drivers/clk/clk-max77686.c @@ -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 clk *clk; struct clk_hw *hw = &max77686->hw; clk = clk_register(dev, hw); - if (IS_ERR(clk)) - return -ENOMEM; + return clk; max77686->lookup = kzalloc(sizeof(struct clk_lookup), GFP_KERNEL); if (!max77686->lookup) - return -ENOMEM; + return ERR_PTR(-ENOMEM); max77686->lookup->con_id = hw->init->name; max77686->lookup->clk = clk; clkdev_add(max77686->lookup); - return 0; + return clk; } 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++) { + struct clk *clk; + max77686_clks[i]->iodev = iodev; max77686_clks[i]->mask = 1 << i; max77686_clks[i]->hw.init = &max77686_clks_init[i]; - ret = max77686_clk_register(&pdev->dev, max77686_clks[i]); - if (ret) { + clk = max77686_clk_register(&pdev->dev, max77686_clks[i]); + if (IS_ERR(clk)) { + ret = PTR_ERR(clk); + switch (i) { case MAX77686_CLK_AP: dev_err(&pdev->dev, "Fail to register CLK_AP\n"); |