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>

diff --git a/drivers/memory/tegra/tegra30-emc.c b/drivers/memory/tegra/tegra30-emc.c
index c96aa63a5aa085a409ae7ec901d2a210748f5bcb..cca386af423e9647266878ce6cd1bcec09c8eba4 100644 (file)
--- a/drivers/memory/tegra/tegra30-emc.c
+++ b/drivers/memory/tegra/tegra30-emc.c
@@ -1563,9 +1563,8 @@ static int tegra_emc_interconnect_init(struct tegra_emc *emc)
 
 remove_nodes:
        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)
@@ -1592,16 +1591,13 @@ static int tegra_emc_init_clk(struct tegra_emc *emc)
                return err;
 
        emc->clk = devm_clk_get(emc->dev, NULL);
-       if (IS_ERR(emc->clk)) {
-               dev_err(emc->dev, "failed to get EMC clock: %pe\n", emc->clk);
-               return PTR_ERR(emc->clk);
-       }
+       if (IS_ERR(emc->clk))
+               return dev_err_probe(emc->dev, PTR_ERR(emc->clk),
+                                    "failed to get EMC clock\n");
 
        err = clk_notifier_register(emc->clk, &emc->clk_nb);
-       if (err) {
-               dev_err(emc->dev, "failed to register clk notifier: %d\n", err);
-               return err;
-       }
+       if (err)
+               return dev_err_probe(emc->dev, err, "failed to register clk notifier\n");
 
        err = devm_add_action_or_reset(emc->dev,
                                       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,
                               dev_name(&pdev->dev), emc);
-       if (err) {
-               dev_err(&pdev->dev, "failed to request irq: %d\n", err);
-               return err;
-       }
+       if (err)
+               return dev_err_probe(&pdev->dev, err, "failed to request irq\n");
 
        err = tegra_emc_init_clk(emc);
        if (err)