浏览代码

ASoC: Intel: cleanup runtime_pm initialization

For ACPI we missed to pm_runtime_enable() call which is required to tell PM
core that runtime on this device is enabled now. Since this is common to
both PCI and APCI move it out. Also for ACPI we do not require
pm_runtime_allow() call, so remove that

Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Vinod Koul 10 年之前
父节点
当前提交
92a6e2a227
共有 1 个文件被更改,包括 5 次插入5 次删除
  1. 5 5
      sound/soc/intel/sst/sst.c

+ 5 - 5
sound/soc/intel/sst/sst.c

@@ -378,13 +378,13 @@ void sst_configure_runtime_pm(struct intel_sst_drv *ctx)
 	 * initially active. So change the state to active before
 	 * initially active. So change the state to active before
 	 * enabling the pm
 	 * enabling the pm
 	 */
 	 */
-	if (acpi_disabled) {
+	pm_runtime_enable(ctx->dev);
+
+	if (acpi_disabled)
 		pm_runtime_set_active(ctx->dev);
 		pm_runtime_set_active(ctx->dev);
-		pm_runtime_enable(ctx->dev);
-	} else {
-		pm_runtime_allow(ctx->dev);
+	else
 		pm_runtime_put_noidle(ctx->dev);
 		pm_runtime_put_noidle(ctx->dev);
-	}
+
 	sst_save_shim64(ctx, ctx->shim, ctx->shim_regs64);
 	sst_save_shim64(ctx, ctx->shim, ctx->shim_regs64);
 }
 }
 EXPORT_SYMBOL_GPL(sst_configure_runtime_pm);
 EXPORT_SYMBOL_GPL(sst_configure_runtime_pm);