i2c: tegra: Factor out hardware initialization into separate function

Factor out hardware initialization into a separate function from the probe
function. The only place where runtime PM needs to be resumed during probe
is the place of hardware initialization, hence it makes sense to factor
out it in order to have a bit cleaner error handling in tegra_i2c_probe().

Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Acked-by: Thierry Reding <treding@nvidia.com>
Tested-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Wolfram Sang <wsa@kernel.org>

diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
index 2d18a35dc18c48f0dc22356076b3cc34e0ac99a8..d8fc5cdcc310117c12b3eddf68178976330ec53f 100644 (file)
--- a/drivers/i2c/busses/i2c-tegra.c
+++ b/drivers/i2c/busses/i2c-tegra.c
@@ -1661,9 +1661,23 @@ static void tegra_i2c_release_clocks(struct tegra_i2c_dev *i2c_dev)
        clk_bulk_unprepare(i2c_dev->nclocks, i2c_dev->clocks);
 }
 
+static int tegra_i2c_init_hardware(struct tegra_i2c_dev *i2c_dev)
+{
+       int ret;
+
+       ret = pm_runtime_get_sync(i2c_dev->dev);
+       if (ret < 0)
+               dev_err(i2c_dev->dev, "runtime resume failed: %d\n", ret);
+       else
+               ret = tegra_i2c_init(i2c_dev);
+
+       pm_runtime_put(i2c_dev->dev);
+
+       return ret;
+}
+
 static int tegra_i2c_probe(struct platform_device *pdev)
 {
-       struct device *dev = &pdev->dev;
        struct tegra_i2c_dev *i2c_dev;
        struct resource *res;
        int ret;
@@ -1729,15 +1743,10 @@ static int tegra_i2c_probe(struct platform_device *pdev)
        if (!i2c_dev->is_vi)
                pm_runtime_irq_safe(&pdev->dev);
        pm_runtime_enable(&pdev->dev);
-       ret = pm_runtime_get_sync(i2c_dev->dev);
-       if (ret < 0) {
-               dev_err(dev, "runtime resume failed\n");
-               goto put_rpm;
-       }
 
-       ret = tegra_i2c_init(i2c_dev);
+       ret = tegra_i2c_init_hardware(i2c_dev);
        if (ret)
-               goto put_rpm;
+               goto release_rpm;
 
        i2c_set_adapdata(&i2c_dev->adapter, i2c_dev);
        i2c_dev->adapter.dev.of_node = pdev->dev.of_node;
@@ -1758,14 +1767,11 @@ static int tegra_i2c_probe(struct platform_device *pdev)
 
        ret = i2c_add_numbered_adapter(&i2c_dev->adapter);
        if (ret)
-               goto put_rpm;
-
-       pm_runtime_put(&pdev->dev);
+               goto release_rpm;
 
        return 0;
 
-put_rpm:
-       pm_runtime_put_sync(&pdev->dev);
+release_rpm:
        pm_runtime_disable(&pdev->dev);
 
        tegra_i2c_release_dma(i2c_dev);