p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

irqchip/gic-pm: Update driver to use of_pm_clk_add_clk 

Commit 498b5fdd40 ("PM / clk: Add support for adding a specific clock
from device-tree") add a new helper function for adding a clock from
device-tree to a device. Update the GIC-PM driver to use this new
function to simplify the driver.

Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
This commit is contained in:
Jon Hunter 2016-08-16 11:14:10 +01:00 committed by Marc Zyngier
parent 91ef84428a
commit 39a342b252
1 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/irqchip/irq-gic-pm.c
View File

@ -64,7 +64,6 @@ static int gic_runtime_suspend(struct device *dev)
static int gic_get_clocks(struct device *dev, const struct gic_clk_data *data) static int gic_get_clocks(struct device *dev, const struct gic_clk_data *data)
{ {
struct clk *clk;
unsigned int i; unsigned int i;
int ret; int ret;
@ -76,28 +75,16 @@ static int gic_get_clocks(struct device *dev, const struct gic_clk_data *data)
return ret; return ret;
for (i = 0; i < data->num_clocks; i++) { for (i = 0; i < data->num_clocks; i++) {
clk = of_clk_get_by_name(dev->of_node, data->clocks[i]); ret = of_pm_clk_add_clk(dev, data->clocks[i]);
if (IS_ERR(clk)) {
dev_err(dev, "failed to get clock %s\n",
data->clocks[i]);
ret = PTR_ERR(clk);
goto error;
}
ret = pm_clk_add_clk(dev, clk);
if (ret) { if (ret) {
dev_err(dev, "failed to add clock at index %d\n", i); dev_err(dev, "failed to add clock %s\n",
clk_put(clk); data->clocks[i]);
goto error; pm_clk_destroy(dev);
return ret;
} }
} }
return 0; return 0;
error:
pm_clk_destroy(dev);
return ret;
} }
static int gic_probe(struct platform_device *pdev) static int gic_probe(struct platform_device *pdev)