ASoC: SOF: move PM callbacks to the SOF platform device

Set the PM callbacks for the SOF device instead of the
acpi/pci/spi device. pm_runtime_enable() is called in the
pcm_probe() method and it is enabled for the platform device.

Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>

Author: ranj063

sound/soc/sof/core.c

@@ -371,9 +371,17 @@ void snd_sof_shutdown(struct device *dev)
 }
 EXPORT_SYMBOL(snd_sof_shutdown);
 
+static const struct dev_pm_ops sof_platform_pm = {
+	SET_SYSTEM_SLEEP_PM_OPS(snd_sof_suspend, snd_sof_resume)
+	SET_RUNTIME_PM_OPS(snd_sof_runtime_suspend, snd_sof_runtime_resume,
+			   NULL)
+	.suspend_late = snd_sof_suspend_late,
+};
+
 static struct platform_driver sof_driver = {
 	.driver = {
 		.name = "sof-audio",
+		.pm = &sof_platform_pm,
 	},
 
 	.probe = sof_probe,

sound/soc/sof/sof-acpi-dev.c

@@ -158,13 +158,6 @@ static void sof_acpi_fw_cb(const struct firmware *fw, void *context)
 	}
 }
 
-static const struct dev_pm_ops sof_acpi_pm = {
-	SET_SYSTEM_SLEEP_PM_OPS(snd_sof_suspend, snd_sof_resume)
-	SET_RUNTIME_PM_OPS(snd_sof_runtime_suspend, snd_sof_runtime_resume,
-			   NULL)
-	.suspend_late = snd_sof_suspend_late,
-};
-
 static const struct sof_ops_table mach_ops[] = {
 #if IS_ENABLED(CONFIG_SND_SOC_SOF_HASWELL)
 	{&sof_acpi_haswell_desc, &sof_hsw_ops},
@@ -344,7 +337,6 @@ static struct platform_driver snd_sof_acpi_driver = {
 	.shutdown = sof_acpi_shutdown,
 	.driver = {
 		.name = "sof-audio-acpi",
-		.pm = &sof_acpi_pm,
 		.acpi_match_table = ACPI_PTR(sof_acpi_match),
 	},
 };

sound/soc/sof/sof-pci-dev.c

@@ -151,13 +151,6 @@ static void sof_pci_fw_cb(const struct firmware *fw, void *context)
 	}
 }
 
-static const struct dev_pm_ops sof_pci_pm = {
-	SET_SYSTEM_SLEEP_PM_OPS(snd_sof_suspend, snd_sof_resume)
-	SET_RUNTIME_PM_OPS(snd_sof_runtime_suspend, snd_sof_runtime_resume,
-			   NULL)
-	.suspend_late = snd_sof_suspend_late,
-};
-
 static const struct sof_ops_table mach_ops[] = {
 #if IS_ENABLED(CONFIG_SND_SOC_SOF_APOLLOLAKE)
 	{&bxt_desc, &sof_apl_ops},
@@ -368,9 +361,6 @@ static struct pci_driver snd_sof_pci_driver = {
 	.probe = sof_pci_probe,
 	.remove = sof_pci_remove,
 	.shutdown = sof_pci_shutdown,
-	.driver = {
-		.pm = &sof_pci_pm,
-	},
 };
 module_pci_driver(snd_sof_pci_driver);
 

sound/soc/sof/sof-spi-dev.c

@@ -43,13 +43,6 @@ static void sof_spi_fw_cb(const struct firmware *fw, void *context)
 	}
 }
 
-static const struct dev_pm_ops sof_spi_pm = {
-	SET_SYSTEM_SLEEP_PM_OPS(snd_sof_suspend, snd_sof_resume)
-	SET_RUNTIME_PM_OPS(snd_sof_runtime_suspend, snd_sof_runtime_resume,
-			   NULL)
-	.suspend_late = snd_sof_suspend_late,
-};
-
 static int sof_spi_probe(struct spi_device *spi)
 {
 	struct device *dev = &spi->dev;