[79/89] ASoC: SOF: pci: Convert to EXPORT_NS_DEV_PM_OPS()

Message ID	20250313174139.29942-80-tiwai@suse.de (mailing list archive)
State	New
Headers	show Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BFAD018D65F for <linux-sound@vger.kernel.org>; Thu, 13 Mar 2025 17:45:46 +0000 (UTC) From: Takashi Iwai <tiwai@suse.de> To: Mark Brown <broonie@kernel.org> Cc: linux-sound@vger.kernel.org, sound-open-firmware@alsa-project.org Subject: [PATCH 79/89] ASoC: SOF: pci: Convert to EXPORT_NS_DEV_PM_OPS() Date: Thu, 13 Mar 2025 18:41:24 +0100 Message-ID: <20250313174139.29942-80-tiwai@suse.de> In-Reply-To: <20250313174139.29942-1-tiwai@suse.de> References: <20250313174139.29942-1-tiwai@suse.de> Precedence: bulk MIME-Version: 1.0 Content-Transfer-Encoding: 8bit
Series	ASoC: Convert to modern PM macros \| expand [00/89] ASoC: Convert to modern PM macros [01/89] ASoC: au1x: Convert to DEFINE_SIPMLE_DEV_PM_OPS() [02/89] ASoC: ak4375: Convert to RUNTIME_PM_OPS() & co [03/89] ASoC: ak4458: Convert to RUNTIME_PM_OPS() & co [04/89] ASoC: ak5558: Convert to RUNTIME_PM_OPS() & co [05/89] ASoC: cs35l32: Convert to RUNTIME_PM_OPS() [06/89] ASoC: cs35l33: Convert to RUNTIME_PM_OPS() [07/89] ASoC: cs35l34: Convert to RUNTIME_PM_OPS() [08/89] ASoC: cs35l56: Convert to RUNTIME_PM_OPS() [09/89] ASoC: cs4234: Convert to RUNTIME_PM_OPS() [10/89] ASoC: cs42l42: Convert to RUNTIME_PM_OPS() & co [11/89] ASoC: cs42l51: Convert to SYSTEM_SLEEP_PM_OPS() [12/89] ASoC: cs42l83: Convert to SYSTEM_SLEEP_PM_OPS() [13/89] ASoC: cs42xx8: Convert to EXPORT_GPL_DEV_PM_OPS() [14/89] ASoC: cs43130: Convert to RUNTIME_PM_OPS() [15/89] ASoC: cs4349: Convert to RUNTIME_PM_OPS() [16/89] ASoC: cs53l30: Convert to RUNTIME_PM_OPS() [17/89] ASoC: cx2072x: Convert to RUNTIME_PM_OPS() & co [18/89] ASoC: da7213: Convert to RUNTIME_PM_OPS() & co [19/89] ASoC: hdac_hdmi: Convert to RUNTIME_PM_OPS() & co [20/89] ASoC: lpass: Convert to RUNTIME_PM_OPS() [21/89] ASoC: max98090: Convert to RUNTIME_PM_OPS() & co [22/89] ASoC: max98373: Convert to RUNTIME_PM_OPS() & co [23/89] ASoC: max98390: Convert to SYSTEM_SLEEP_PM_OPS() [24/89] ASoC: max98396: Convert to SYSTEM_SLEEP_PM_OPS() [25/89] ASoC: max98520: Convert to SYSTEM_SLEEP_PM_OPS() [26/89] ASoC: max9860: Convert to RUNTIME_PM_OPS() [27/89] ASoC: max98927: Convert to SYSTEM_SLEEP_PM_OPS() [28/89] ASoC: mt6660: Convert to RUNTIME_PM_OPS() [29/89] ASoC: pcm512x: Convert to EXPORT_GPL_DEV_PM_OPS() [30/89] ASoC: rt1017-sdca-sdw: Convert to RUNTIME_PM_OPS() & co [31/89] ASoC: rt1308-sdw: Convert to RUNTIME_PM_OPS() & co [32/89] ASoC: rt1316-sdw: Convert to RUNTIME_PM_OPS() & co [33/89] ASoC: rt1318-sdw: Convert to RUNTIME_PM_OPS() & co [34/89] ASoC: rt1320-sdw: Convert to RUNTIME_PM_OPS() & co [35/89] ASoC: rt5514: Convert to SYSTEM_SLEEP_PM_OPS() [36/89] ASoC: rt5645: Convert to SYSTEM_SLEEP_PM_OPS() [37/89] ASoC: rt5682-sdw: Convert to RUNTIME_PM_OPS() & co [38/89] ASoC: rt700-sdw: Convert to RUNTIME_PM_OPS() & co [39/89] ASoC: rt711: Convert to RUNTIME_PM_OPS() & co [40/89] ASoC: rt712: Convert to RUNTIME_PM_OPS() & co [41/89] ASoC: rt715: Convert to RUNTIME_PM_OPS() & co [42/89] ASoC: rt721: Convert to RUNTIME_PM_OPS() & co [43/89] ASoC: rt722: Convert to RUNTIME_PM_OPS() & co [44/89] ASoC: rt9120: Convert to RUNTIME_PM_OPS() [45/89] ASoC: rtq9128: Convert to RUNTIME_PM_OPS() [46/89] ASoC: tas2552: Convert to RUNTIME_PM_OPS() [47/89] ASoC: ts3a227e: Convert to SYSTEM_SLEEP_PM_OPS() [48/89] ASoC: wcd937x: Convert to RUNTIME_PM_OPS() [49/89] ASoC: wcd938x: Convert to RUNTIME_PM_OPS() [50/89] ASoC: wcd939x: Convert to RUNTIME_PM_OPS() [51/89] ASoC: wm2200: Convert to RUNTIME_PM_OPS() [52/89] ASoC: wm5100: Convert to RUNTIME_PM_OPS() [53/89] ASoC: wm8804: Convert to EXPORT_GPL_DEV_PM_OPS() [54/89] ASoC: wm8962: Convert to RUNTIME_PM_OPS() & co [55/89] ASoC: wm8994: Convert to SYSTEM_SLEEP_PM_OPS() [56/89] ASoC: wsa881x: Convert to RUNTIME_PM_OPS() [57/89] ASoC: wsa883x: Convert to RUNTIME_PM_OPS() [58/89] ASoC: wsa884x: Convert to RUNTIME_PM_OPS() [59/89] ASoC: dwc: Convert to RUNTIME_PM_OPS() [60/89] ASoC: fsl: Convert to RUNTIME_PM_OPS() and co [61/89] ASoC: img: Convert to RUNTIME_PM_OPS() and co [62/89] ASoC: intel: avs: Convert to RUNTIE_PM_OPS() [63/89] ASoC: intel: catpt: Convert to RUNTIE_PM_OPS() & co [64/89] ASoC: mediatek: mt2701: Convert to RUNTIME_PM_OPS() [65/89] ASoC: mediatek: mt6797: Convert to RUNTIME_PM_OPS() [66/89] ASoC: mediatek: mt7986: Convert to RUNTIME_PM_OPS() [67/89] ASoC: mediatek: mt8173: Convert to RUNTIME_PM_OPS() [68/89] ASoC: mediatek: mt8183: Convert to RUNTIME_PM_OPS() [69/89] ASoC: mediatek: mt8186: Convert to RUNTIME_PM_OPS() [70/89] ASoC: mediatek: mt8188: Convert to RUNTIME_PM_OPS() [71/89] ASoC: mediatek: mt8192: Convert to RUNTIME_PM_OPS() [72/89] ASoC: mediatek: mt8195: Convert to RUNTIME_PM_OPS() [73/89] ASoC: mediatek: mt8365: Convert to RUNTIME_PM_OPS() & co [74/89] ASoC: qcom: Convert to SYSTEM_SLEEP_PM_OPS() [75/89] ASoC: rcar: Convert to SYSTEM_SLEEP_PM_OPS() [76/89] ASoC: rockchip: Convert to RUNTIME_PM_OPS() & co [77/89] ASoC: samsung: Convert to RUNTIME_PM_OPS() & co [78/89] ASoC: SOF: acpi: Convert to EXPORT_NS_DEV_PM_OPS() [79/89] ASoC: SOF: pci: Convert to EXPORT_NS_DEV_PM_OPS() [80/89] ASoC: SOF: of: Convert to EXPORT_NS_DEV_PM_OPS() [81/89] ASoC: stm: Convert to SYSTEM_SLEEP_PM_OPS() [82/89] ASoC: sunxi: Convert to RUNTIME_PM_OPS() [83/89] ASoC: tegra186: Convert to RUNTIME_PM_OPS() & co [84/89] ASoC: tegra210: Convert to RUNTIME_PM_OPS() & co [85/89] ASoC: tegra20: Convert to RUNTIME_PM_OPS() & co [86/89] ASoC: tegra30: Convert to RUNTIME_PM_OPS() & co [87/89] ASoC: xtensa: Convert to RUNTIME_PM_OPS() [88/89] ASoC: amd: Convert to RUNTIME_PM_OPS() & co [89/89] ASoC: pcm3168a: Convert to EXPORT_GPL_DEV_PM_OPS()

Message ID

20250313174139.29942-80-tiwai@suse.de (mailing list archive)

State

New

Headers

From: Takashi Iwai <tiwai@suse.de>
To: Mark Brown <broonie@kernel.org>
Cc: linux-sound@vger.kernel.org,
	sound-open-firmware@alsa-project.org
Subject: [PATCH 79/89] ASoC: SOF: pci: Convert to EXPORT_NS_DEV_PM_OPS()
Date: Thu, 13 Mar 2025 18:41:24 +0100
Message-ID: <20250313174139.29942-80-tiwai@suse.de>
In-Reply-To: <20250313174139.29942-1-tiwai@suse.de>
References: <20250313174139.29942-1-tiwai@suse.de>
Precedence: bulk
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

Series

ASoC: Convert to modern PM macros | expand

Commit Message

Takashi Iwai March 13, 2025, 5:41 p.m. UTC

Use the newer EXPORT_NS_DEV_PM_OPS() macro together with pm_ptr().

This optimizes slightly when CONFIG_PM is disabled, too.

Cc: sound-open-firmware@alsa-project.org
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/soc/sof/amd/pci-acp63.c   | 2 +-
 sound/soc/sof/amd/pci-acp70.c   | 2 +-
 sound/soc/sof/amd/pci-rn.c      | 2 +-
 sound/soc/sof/amd/pci-vangogh.c | 2 +-
 sound/soc/sof/intel/pci-apl.c   | 2 +-
 sound/soc/sof/intel/pci-cnl.c   | 2 +-
 sound/soc/sof/intel/pci-icl.c   | 2 +-
 sound/soc/sof/intel/pci-lnl.c   | 2 +-
 sound/soc/sof/intel/pci-mtl.c   | 2 +-
 sound/soc/sof/intel/pci-ptl.c   | 2 +-
 sound/soc/sof/intel/pci-skl.c   | 2 +-
 sound/soc/sof/intel/pci-tgl.c   | 2 +-
 sound/soc/sof/intel/pci-tng.c   | 2 +-
 sound/soc/sof/sof-pci-dev.c     | 9 ++++-----
 14 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/sound/soc/sof/amd/pci-acp63.c b/sound/soc/sof/amd/pci-acp63.c
index 13aa87cdeeac..21ffdfdcf03d 100644
--- a/sound/soc/sof/amd/pci-acp63.c
+++ b/sound/soc/sof/amd/pci-acp63.c
@@ -104,7 +104,7 @@  static struct pci_driver snd_sof_pci_amd_acp63_driver = {
 	.probe = acp63_pci_probe,
 	.remove = acp63_pci_remove,
 	.driver = {
-		.pm = &sof_pci_pm,
+		.pm = pm_ptr(&sof_pci_pm),
 	},
 };
 module_pci_driver(snd_sof_pci_amd_acp63_driver);
diff --git a/sound/soc/sof/amd/pci-acp70.c b/sound/soc/sof/amd/pci-acp70.c
index d886bdf3a112..8fa1170a2161 100644
--- a/sound/soc/sof/amd/pci-acp70.c
+++ b/sound/soc/sof/amd/pci-acp70.c
@@ -100,7 +100,7 @@  static struct pci_driver snd_sof_pci_amd_acp70_driver = {
 	.probe = acp70_pci_probe,
 	.remove = acp70_pci_remove,
 	.driver = {
-		.pm = &sof_pci_pm,
+		.pm = pm_ptr(&sof_pci_pm),
 	},
 };
 module_pci_driver(snd_sof_pci_amd_acp70_driver);
diff --git a/sound/soc/sof/amd/pci-rn.c b/sound/soc/sof/amd/pci-rn.c
index 4a36029a00de..2b7fbcf11b55 100644
--- a/sound/soc/sof/amd/pci-rn.c
+++ b/sound/soc/sof/amd/pci-rn.c
@@ -97,7 +97,7 @@  static struct pci_driver snd_sof_pci_amd_rn_driver = {
 	.probe = acp_pci_rn_probe,
 	.remove = acp_pci_rn_remove,
 	.driver = {
-		.pm = &sof_pci_pm,
+		.pm = pm_ptr(&sof_pci_pm),
 	},
 };
 module_pci_driver(snd_sof_pci_amd_rn_driver);
diff --git a/sound/soc/sof/amd/pci-vangogh.c b/sound/soc/sof/amd/pci-vangogh.c
index caf9e2b2e463..6ef692becfb9 100644
--- a/sound/soc/sof/amd/pci-vangogh.c
+++ b/sound/soc/sof/amd/pci-vangogh.c
@@ -90,7 +90,7 @@  static struct pci_driver snd_sof_pci_amd_vgh_driver = {
 	.probe = acp_pci_vgh_probe,
 	.remove = acp_pci_vgh_remove,
 	.driver = {
-		.pm = &sof_pci_pm,
+		.pm = pm_ptr(&sof_pci_pm),
 	},
 };
 module_pci_driver(snd_sof_pci_amd_vgh_driver);
diff --git a/sound/soc/sof/intel/pci-apl.c b/sound/soc/sof/intel/pci-apl.c
index 94ab3c61e3f7..0bf7ee753bc3 100644
--- a/sound/soc/sof/intel/pci-apl.c
+++ b/sound/soc/sof/intel/pci-apl.c
@@ -99,7 +99,7 @@  static struct pci_driver snd_sof_pci_intel_apl_driver = {
 	.remove = sof_pci_remove,
 	.shutdown = sof_pci_shutdown,
 	.driver = {
-		.pm = &sof_pci_pm,
+		.pm = pm_ptr(&sof_pci_pm),
 	},
 };
 module_pci_driver(snd_sof_pci_intel_apl_driver);
diff --git a/sound/soc/sof/intel/pci-cnl.c b/sound/soc/sof/intel/pci-cnl.c
index 739c352c3860..de48640024e4 100644
--- a/sound/soc/sof/intel/pci-cnl.c
+++ b/sound/soc/sof/intel/pci-cnl.c
@@ -137,7 +137,7 @@  static struct pci_driver snd_sof_pci_intel_cnl_driver = {
 	.remove = sof_pci_remove,
 	.shutdown = sof_pci_shutdown,
 	.driver = {
-		.pm = &sof_pci_pm,
+		.pm = pm_ptr(&sof_pci_pm),
 	},
 };
 module_pci_driver(snd_sof_pci_intel_cnl_driver);
diff --git a/sound/soc/sof/intel/pci-icl.c b/sound/soc/sof/intel/pci-icl.c
index 8545ab95eac8..fd219e654844 100644
--- a/sound/soc/sof/intel/pci-icl.c
+++ b/sound/soc/sof/intel/pci-icl.c
@@ -102,7 +102,7 @@  static struct pci_driver snd_sof_pci_intel_icl_driver = {
 	.remove = sof_pci_remove,
 	.shutdown = sof_pci_shutdown,
 	.driver = {
-		.pm = &sof_pci_pm,
+		.pm = pm_ptr(&sof_pci_pm),
 	},
 };
 module_pci_driver(snd_sof_pci_intel_icl_driver);
diff --git a/sound/soc/sof/intel/pci-lnl.c b/sound/soc/sof/intel/pci-lnl.c
index 91b9cff8c4ca..ae379c23f008 100644
--- a/sound/soc/sof/intel/pci-lnl.c
+++ b/sound/soc/sof/intel/pci-lnl.c
@@ -72,7 +72,7 @@  static struct pci_driver snd_sof_pci_intel_lnl_driver = {
 	.remove = sof_pci_remove,
 	.shutdown = sof_pci_shutdown,
 	.driver = {
-		.pm = &sof_pci_pm,
+		.pm = pm_ptr(&sof_pci_pm),
 	},
 };
 module_pci_driver(snd_sof_pci_intel_lnl_driver);
diff --git a/sound/soc/sof/intel/pci-mtl.c b/sound/soc/sof/intel/pci-mtl.c
index c5048a4a56be..7b2533999195 100644
--- a/sound/soc/sof/intel/pci-mtl.c
+++ b/sound/soc/sof/intel/pci-mtl.c
@@ -135,7 +135,7 @@  static struct pci_driver snd_sof_pci_intel_mtl_driver = {
 	.remove = sof_pci_remove,
 	.shutdown = sof_pci_shutdown,
 	.driver = {
-		.pm = &sof_pci_pm,
+		.pm = pm_ptr(&sof_pci_pm),
 	},
 };
 module_pci_driver(snd_sof_pci_intel_mtl_driver);
diff --git a/sound/soc/sof/intel/pci-ptl.c b/sound/soc/sof/intel/pci-ptl.c
index 3812ab6d99c0..7d4c46f56931 100644
--- a/sound/soc/sof/intel/pci-ptl.c
+++ b/sound/soc/sof/intel/pci-ptl.c
@@ -71,7 +71,7 @@  static struct pci_driver snd_sof_pci_intel_ptl_driver = {
 	.remove = sof_pci_remove,
 	.shutdown = sof_pci_shutdown,
 	.driver = {
-		.pm = &sof_pci_pm,
+		.pm = pm_ptr(&sof_pci_pm),
 	},
 };
 module_pci_driver(snd_sof_pci_intel_ptl_driver);
diff --git a/sound/soc/sof/intel/pci-skl.c b/sound/soc/sof/intel/pci-skl.c
index bd9daae51e4c..a16945dc35f7 100644
--- a/sound/soc/sof/intel/pci-skl.c
+++ b/sound/soc/sof/intel/pci-skl.c
@@ -83,7 +83,7 @@  static struct pci_driver snd_sof_pci_intel_skl_driver = {
 	.remove = sof_pci_remove,
 	.shutdown = sof_pci_shutdown,
 	.driver = {
-		.pm = &sof_pci_pm,
+		.pm = pm_ptr(&sof_pci_pm),
 	},
 };
 module_pci_driver(snd_sof_pci_intel_skl_driver);
diff --git a/sound/soc/sof/intel/pci-tgl.c b/sound/soc/sof/intel/pci-tgl.c
index f76a7197f6ca..437c43819825 100644
--- a/sound/soc/sof/intel/pci-tgl.c
+++ b/sound/soc/sof/intel/pci-tgl.c
@@ -311,7 +311,7 @@  static struct pci_driver snd_sof_pci_intel_tgl_driver = {
 	.remove = sof_pci_remove,
 	.shutdown = sof_pci_shutdown,
 	.driver = {
-		.pm = &sof_pci_pm,
+		.pm = pm_ptr(&sof_pci_pm),
 	},
 };
 module_pci_driver(snd_sof_pci_intel_tgl_driver);
diff --git a/sound/soc/sof/intel/pci-tng.c b/sound/soc/sof/intel/pci-tng.c
index 3eb7400942dd..0c11cc1fd820 100644
--- a/sound/soc/sof/intel/pci-tng.c
+++ b/sound/soc/sof/intel/pci-tng.c
@@ -238,7 +238,7 @@  static struct pci_driver snd_sof_pci_intel_tng_driver = {
 	.remove = sof_pci_remove,
 	.shutdown = sof_pci_shutdown,
 	.driver = {
-		.pm = &sof_pci_pm,
+		.pm = pm_ptr(&sof_pci_pm),
 	},
 };
 module_pci_driver(snd_sof_pci_intel_tng_driver);
diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c
index 103377e2caaf..8ae1562ab4ef 100644
--- a/sound/soc/sof/sof-pci-dev.c
+++ b/sound/soc/sof/sof-pci-dev.c
@@ -155,14 +155,13 @@  static const struct dmi_system_id community_key_platforms[] = {
 	{},
 };
 
-const struct dev_pm_ops sof_pci_pm = {
+EXPORT_NS_DEV_PM_OPS(sof_pci_pm, "SND_SOC_SOF_PCI_DEV") = {
 	.prepare = snd_sof_prepare,
 	.complete = snd_sof_complete,
-	SET_SYSTEM_SLEEP_PM_OPS(snd_sof_suspend, snd_sof_resume)
-	SET_RUNTIME_PM_OPS(snd_sof_runtime_suspend, snd_sof_runtime_resume,
-			   snd_sof_runtime_idle)
+	SYSTEM_SLEEP_PM_OPS(snd_sof_suspend, snd_sof_resume)
+	RUNTIME_PM_OPS(snd_sof_runtime_suspend, snd_sof_runtime_resume,
+		       snd_sof_runtime_idle)
 };
-EXPORT_SYMBOL_NS(sof_pci_pm, "SND_SOC_SOF_PCI_DEV");
 
 static void sof_pci_probe_complete(struct device *dev)
 {

[79/89] ASoC: SOF: pci: Convert to EXPORT_NS_DEV_PM_OPS()

Commit Message

Patch