From f1fdb6e6a95e2887d8b9f68571a80613d7daed50 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 13 Jun 2023 18:40:18 +0000 Subject: [PATCH] Revert "ASoC: fsl_micfil: Fix error handler with pm_runtime_enable" This reverts commit ce6c7befc2ea73ea0e496b35dbac72363c7c18b0. It breaks the Android KABI and will be brought back at a later time when it is safe to do so. Bug: 161946584 Change-Id: I38380dd554132e8495672b216e6312011827c932 Signed-off-by: Greg Kroah-Hartman --- sound/soc/fsl/fsl_micfil.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/sound/soc/fsl/fsl_micfil.c b/sound/soc/fsl/fsl_micfil.c index 3a03f49452fa..4b8fe9b8be40 100644 --- a/sound/soc/fsl/fsl_micfil.c +++ b/sound/soc/fsl/fsl_micfil.c @@ -712,7 +712,7 @@ static int fsl_micfil_probe(struct platform_device *pdev) ret = devm_snd_dmaengine_pcm_register(&pdev->dev, NULL, 0); if (ret) { dev_err(&pdev->dev, "failed to pcm register\n"); - goto err_pm_disable; + return ret; } fsl_micfil_dai.capture.formats = micfil->soc->formats; @@ -722,20 +722,9 @@ static int fsl_micfil_probe(struct platform_device *pdev) if (ret) { dev_err(&pdev->dev, "failed to register component %s\n", fsl_micfil_component.name); - goto err_pm_disable; } return ret; - -err_pm_disable: - pm_runtime_disable(&pdev->dev); - - return ret; -} - -static void fsl_micfil_remove(struct platform_device *pdev) -{ - pm_runtime_disable(&pdev->dev); } static int __maybe_unused fsl_micfil_runtime_suspend(struct device *dev) @@ -796,7 +785,6 @@ static const struct dev_pm_ops fsl_micfil_pm_ops = { static struct platform_driver fsl_micfil_driver = { .probe = fsl_micfil_probe, - .remove_new = fsl_micfil_remove, .driver = { .name = "fsl-micfil-dai", .pm = &fsl_micfil_pm_ops,