diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2016-10-03 09:36:04 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2016-10-03 09:36:04 +0530 |
| commit | 7afb1fa8cba1ab0b458131ad0991cd4a4e7466b2 (patch) | |
| tree | b4bd5e04001bc6760cab66a98fd63ce37bf985de | |
| parent | f2469114c66158b36143a091255b4ed2d61fab7c (diff) | |
| parent | 24fec75017ae2c9ecc5db71feb999f73d57ba04f (diff) | |
| download | linux-7afb1fa8cba1ab0b458131ad0991cd4a4e7466b2.tar.gz linux-7afb1fa8cba1ab0b458131ad0991cd4a4e7466b2.tar.bz2 linux-7afb1fa8cba1ab0b458131ad0991cd4a4e7466b2.zip | |
Merge branch 'topic/tegra' into for-linus
| -rw-r--r-- | drivers/dma/tegra210-adma.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/drivers/dma/tegra210-adma.c b/drivers/dma/tegra210-adma.c index c4b121c4559d..b10cbaa82ff5 100644 --- a/drivers/dma/tegra210-adma.c +++ b/drivers/dma/tegra210-adma.c @@ -670,7 +670,6 @@ static int tegra_adma_probe(struct platform_device *pdev) const struct tegra_adma_chip_data *cdata; struct tegra_adma *tdma; struct resource *res; - struct clk *clk; int ret, i; cdata = of_device_get_match_data(&pdev->dev); @@ -697,18 +696,9 @@ static int tegra_adma_probe(struct platform_device *pdev) if (ret) return ret; - clk = clk_get(&pdev->dev, "d_audio"); - if (IS_ERR(clk)) { - dev_err(&pdev->dev, "ADMA clock not found\n"); - ret = PTR_ERR(clk); - goto clk_destroy; - } - - ret = pm_clk_add_clk(&pdev->dev, clk); - if (ret) { - clk_put(clk); + ret = of_pm_clk_add_clk(&pdev->dev, "d_audio"); + if (ret) goto clk_destroy; - } pm_runtime_enable(&pdev->dev); |