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

ASoC: tegra20: spdif: 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 SPDIF driver.

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


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

sound/soc/tegra/tegra20_spdif.c

+1 −11
Original line number Diff line number Diff line
@@ -294,18 +294,13 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev) 
	spdif->playback_dma_data.slave_id = dmareq->start;



	pm_runtime_enable(&pdev->dev);

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

		ret = tegra20_spdif_runtime_resume(&pdev->dev);

		if (ret)

			goto err_pm_disable;

	}



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

					 &tegra20_spdif_dai, 1);

	if (ret) {

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

		ret = -ENOMEM;

		goto err_suspend;

		goto err_pm_disable;

	}



	ret = tegra_pcm_platform_register(&pdev->dev);
@@ -318,9 +313,6 @@ static int tegra20_spdif_platform_probe(struct platform_device *pdev) 


err_unregister_component:

	snd_soc_unregister_component(&pdev->dev);

err_suspend:

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

		tegra20_spdif_runtime_suspend(&pdev->dev);

err_pm_disable:

	pm_runtime_disable(&pdev->dev);
@@ -333,8 +325,6 @@ static int tegra20_spdif_platform_remove(struct platform_device *pdev) 
	snd_soc_unregister_component(&pdev->dev);



	pm_runtime_disable(&pdev->dev);

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

		tegra20_spdif_runtime_suspend(&pdev->dev);



	return 0;

}