Commit d380d48f authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Wolfram Sang
Browse files

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: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Acked-by: default avatarThierry Reding <treding@nvidia.com>
Tested-by: default avatarThierry Reding <treding@nvidia.com>
Signed-off-by: default avatarDmitry Osipenko <digetx@gmail.com>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent 507ae6ab

drivers/i2c/busses/i2c-tegra.c

+19 −13
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE