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

ASoC: tegra20: 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 Tegra20 I2S driver.

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


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

sound/soc/tegra/tegra20_i2s.c

+1 −12
Original line number Original line Diff line number Diff line
@@ -401,18 +401,13 @@ static int tegra20_i2s_platform_probe(struct platform_device *pdev) 
	i2s->playback_dma_data.maxburst = 4;

	i2s->playback_dma_data.maxburst = 4;





	pm_runtime_enable(&pdev->dev);

	pm_runtime_enable(&pdev->dev);

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

		ret = tegra20_i2s_runtime_resume(&pdev->dev);

		if (ret)

			goto err_pm_disable;

	}





	ret = snd_soc_register_component(&pdev->dev, &tegra20_i2s_component,

	ret = snd_soc_register_component(&pdev->dev, &tegra20_i2s_component,

					 &i2s->dai, 1);

					 &i2s->dai, 1);

	if (ret) {

	if (ret) {

		dev_err(&pdev->dev, "Could not register DAI: %d\n", ret);

		dev_err(&pdev->dev, "Could not register DAI: %d\n", ret);

		ret = -ENOMEM;

		ret = -ENOMEM;

		goto err_suspend;

		goto err_pm_disable;

	}

	}





	ret = tegra_pcm_platform_register(&pdev->dev);

	ret = tegra_pcm_platform_register(&pdev->dev);
@@ -425,9 +420,6 @@ static int tegra20_i2s_platform_probe(struct platform_device *pdev) 




err_unregister_component:

err_unregister_component:

	snd_soc_unregister_component(&pdev->dev);

	snd_soc_unregister_component(&pdev->dev);

err_suspend:

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

		tegra20_i2s_runtime_suspend(&pdev->dev);

err_pm_disable:

err_pm_disable:

	pm_runtime_disable(&pdev->dev);

	pm_runtime_disable(&pdev->dev);

err:

err:
@@ -438,10 +430,7 @@ static int tegra20_i2s_platform_remove(struct platform_device *pdev) 
{

{

	tegra_pcm_platform_unregister(&pdev->dev);

	tegra_pcm_platform_unregister(&pdev->dev);

	snd_soc_unregister_component(&pdev->dev);

	snd_soc_unregister_component(&pdev->dev);



	pm_runtime_disable(&pdev->dev);

	pm_runtime_disable(&pdev->dev);

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

		tegra20_i2s_runtime_suspend(&pdev->dev);





	return 0;

	return 0;

}

}