Unverified Commit b5f6f781 authored by Dmitry Osipenko's avatar Dmitry Osipenko Committed by Mark Brown
Browse files

ASoC: tegra30: i2s: Remove handing of disabled runtime PM 



Runtime PM is always available on Tegra since commit 40b2bb1b
("ARM: tegra: enforce PM requirement"), hence there is no need to
handle the case of a disabled RPM by Tegra drivers. Remove handing
of a disabled runtime PM from Tegra30 I2S driver.

Signed-off-by: default avatarDmitry Osipenko <digetx@gmail.com>
Link: https://lore.kernel.org/r/20210314154459.15375-15-digetx@gmail.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 52674aef

sound/soc/tegra/tegra30_i2s.c

+1 −11
Original line number Diff line number Diff line
@@ -461,11 +461,6 @@ static int tegra30_i2s_platform_probe(struct platform_device *pdev) 
	regcache_cache_only(i2s->regmap, true);



	pm_runtime_enable(&pdev->dev);

	if (!pm_runtime_enabled(&pdev->dev)) {

		ret = tegra30_i2s_runtime_resume(&pdev->dev);

		if (ret)

			goto err_pm_disable;

	}



	i2s->playback_dma_data.addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES;

	i2s->playback_dma_data.maxburst = 4;
@@ -475,7 +470,7 @@ static int tegra30_i2s_platform_probe(struct platform_device *pdev) 
					    &i2s->playback_dma_data.addr);

	if (ret) {

		dev_err(&pdev->dev, "Could not alloc TX FIFO: %d\n", ret);

		goto err_suspend;

		goto err_pm_disable;

	}

	ret = tegra30_ahub_set_rx_cif_source(i2s->playback_i2s_cif,

					     i2s->playback_fifo_cif);
@@ -529,9 +524,6 @@ static int tegra30_i2s_platform_probe(struct platform_device *pdev) 
	tegra30_ahub_unset_rx_cif_source(i2s->playback_i2s_cif);

err_free_tx_fifo:

	tegra30_ahub_free_tx_fifo(i2s->playback_fifo_cif);

err_suspend:

	if (!pm_runtime_status_suspended(&pdev->dev))

		tegra30_i2s_runtime_suspend(&pdev->dev);

err_pm_disable:

	pm_runtime_disable(&pdev->dev);

err:
@@ -552,8 +544,6 @@ static int tegra30_i2s_platform_remove(struct platform_device *pdev) 
	tegra30_ahub_free_tx_fifo(i2s->playback_fifo_cif);



	pm_runtime_disable(&pdev->dev);

	if (!pm_runtime_status_suspended(&pdev->dev))

		tegra30_i2s_runtime_suspend(&pdev->dev);



	return 0;

}