Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

memory: tegra30-emc: Simplify and handle deferred probe with dev_err_probe() 

Certain calls, like clk_get, can cause probe deferral and driver should
handle it.  Use dev_err_probe() to fix that and also change other
non-deferred errors cases to make the code simpler.

Reviewed-by: Jon Hunter <jonathanh@nvidia.com>
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
This commit is contained in:
Krzysztof Kozlowski 2025-09-11 11:43:17 +02:00
parent c0ca941c93
commit db2bd7ab1a
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/memory/tegra/tegra30-emc.c
View File

@ -1563,9 +1563,8 @@ static int tegra_emc_interconnect_init(struct tegra_emc *emc)
remove_nodes: remove_nodes:
icc_nodes_remove(&emc->provider); icc_nodes_remove(&emc->provider);
dev_err(emc->dev, "failed to initialize ICC: %d\n", err);
return err; return dev_err_probe(emc->dev, err, "failed to initialize ICC\n");
} }
static void devm_tegra_emc_unset_callback(void *data) static void devm_tegra_emc_unset_callback(void *data)
@ -1592,16 +1591,13 @@ static int tegra_emc_init_clk(struct tegra_emc *emc)
return err; return err;
emc->clk = devm_clk_get(emc->dev, NULL); emc->clk = devm_clk_get(emc->dev, NULL);
if (IS_ERR(emc->clk)) { if (IS_ERR(emc->clk))
dev_err(emc->dev, "failed to get EMC clock: %pe\n", emc->clk); return dev_err_probe(emc->dev, PTR_ERR(emc->clk),
return PTR_ERR(emc->clk); "failed to get EMC clock\n");
}
err = clk_notifier_register(emc->clk, &emc->clk_nb); err = clk_notifier_register(emc->clk, &emc->clk_nb);
if (err) { if (err)
dev_err(emc->dev, "failed to register clk notifier: %d\n", err); return dev_err_probe(emc->dev, err, "failed to register clk notifier\n");
return err;
}
err = devm_add_action_or_reset(emc->dev, err = devm_add_action_or_reset(emc->dev,
devm_tegra_emc_unreg_clk_notifier, emc); devm_tegra_emc_unreg_clk_notifier, emc);
@ -1654,10 +1650,8 @@ static int tegra_emc_probe(struct platform_device *pdev)
err = devm_request_irq(&pdev->dev, emc->irq, tegra_emc_isr, 0, err = devm_request_irq(&pdev->dev, emc->irq, tegra_emc_isr, 0,
dev_name(&pdev->dev), emc); dev_name(&pdev->dev), emc);
if (err) { if (err)
dev_err(&pdev->dev, "failed to request irq: %d\n", err); return dev_err_probe(&pdev->dev, err, "failed to request irq\n");
return err;
}
err = tegra_emc_init_clk(emc); err = tegra_emc_init_clk(emc);
if (err) if (err)