There is no problem for drivers to request pll_m and pll_p clocks for the device, hence there is no need to use clk_get_sys() and it could be replaced with devm_clk_get() for consistency. Signed-off-by: Dmitry Osipenko <digetx@xxxxxxxxx> --- drivers/memory/tegra/tegra20-emc.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/drivers/memory/tegra/tegra20-emc.c b/drivers/memory/tegra/tegra20-emc.c index 43aef3614b65..527aa4b90e95 100644 --- a/drivers/memory/tegra/tegra20-emc.c +++ b/drivers/memory/tegra/tegra20-emc.c @@ -527,33 +527,29 @@ static int tegra_emc_probe(struct platform_device *pdev) goto unset_cb; } - emc->pll_m = clk_get_sys(NULL, "pll_m"); + emc->pll_m = devm_clk_get(&pdev->dev, "pll_m"); if (IS_ERR(emc->pll_m)) { err = PTR_ERR(emc->pll_m); dev_err(&pdev->dev, "failed to get pll_m clock: %d\n", err); goto unset_cb; } - emc->backup_clk = clk_get_sys(NULL, "pll_p"); + emc->backup_clk = devm_clk_get(&pdev->dev, "pll_p"); if (IS_ERR(emc->backup_clk)) { err = PTR_ERR(emc->backup_clk); dev_err(&pdev->dev, "failed to get pll_p clock: %d\n", err); - goto put_pll_m; + goto unset_cb; } err = clk_notifier_register(emc->clk, &emc->clk_nb); if (err) { dev_err(&pdev->dev, "failed to register clk notifier: %d\n", err); - goto put_backup; + goto unset_cb; } return 0; -put_backup: - clk_put(emc->backup_clk); -put_pll_m: - clk_put(emc->pll_m); unset_cb: tegra20_clk_set_emc_round_callback(NULL, NULL); -- 2.21.0