[53/89] ASoC: wm8804: Convert to EXPORT_GPL_DEV_PM_OPS()

Message ID	20250313174139.29942-54-tiwai@suse.de (mailing list archive)
State	New
Headers	show Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (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 B32401D63F8 for <linux-sound@vger.kernel.org>; Thu, 13 Mar 2025 17:44:33 +0000 (UTC) From: Takashi Iwai <tiwai@suse.de> To: Mark Brown <broonie@kernel.org> Cc: linux-sound@vger.kernel.org, patches@opensource.cirrus.com Subject: [PATCH 53/89] ASoC: wm8804: Convert to EXPORT_GPL_DEV_PM_OPS() Date: Thu, 13 Mar 2025 18:40:58 +0100 Message-ID: <20250313174139.29942-54-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-54-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,
	patches@opensource.cirrus.com
Subject: [PATCH 53/89] ASoC: wm8804: Convert to EXPORT_GPL_DEV_PM_OPS()
Date: Thu, 13 Mar 2025 18:40:58 +0100
Message-ID: <20250313174139.29942-54-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:40 p.m. UTC

Use the newer EXPORT_GPL_DEV_PM_OPS() macro together with pm_ptr().
This allows us to drop superfluous CONFIG_PM ifdefs.

This optimizes slightly when CONFIG_PM is disabled, too.

Cc: patches@opensource.cirrus.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/soc/codecs/wm8804-i2c.c | 2 +-
 sound/soc/codecs/wm8804-spi.c | 2 +-
 sound/soc/codecs/wm8804.c     | 7 ++-----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/sound/soc/codecs/wm8804-i2c.c b/sound/soc/codecs/wm8804-i2c.c
index e80dad87219b..3380d7301b17 100644
--- a/sound/soc/codecs/wm8804-i2c.c
+++ b/sound/soc/codecs/wm8804-i2c.c
@@ -56,7 +56,7 @@  MODULE_DEVICE_TABLE(acpi, wm8804_acpi_match);
 static struct i2c_driver wm8804_i2c_driver = {
 	.driver = {
 		.name = "wm8804",
-		.pm = &wm8804_pm,
+		.pm = pm_ptr(&wm8804_pm),
 		.of_match_table = of_match_ptr(wm8804_of_match),
 		.acpi_match_table = ACPI_PTR(wm8804_acpi_match),
 	},
diff --git a/sound/soc/codecs/wm8804-spi.c b/sound/soc/codecs/wm8804-spi.c
index 628568724c20..cf74abfb1a2c 100644
--- a/sound/soc/codecs/wm8804-spi.c
+++ b/sound/soc/codecs/wm8804-spi.c
@@ -38,7 +38,7 @@  MODULE_DEVICE_TABLE(of, wm8804_of_match);
 static struct spi_driver wm8804_spi_driver = {
 	.driver = {
 		.name = "wm8804",
-		.pm = &wm8804_pm,
+		.pm = pm_ptr(&wm8804_pm),
 		.of_match_table = wm8804_of_match,
 	},
 	.probe = wm8804_spi_probe,
diff --git a/sound/soc/codecs/wm8804.c b/sound/soc/codecs/wm8804.c
index 0a879c29eb04..48700cc25cb0 100644
--- a/sound/soc/codecs/wm8804.c
+++ b/sound/soc/codecs/wm8804.c
@@ -680,7 +680,6 @@  void wm8804_remove(struct device *dev)
 }
 EXPORT_SYMBOL_GPL(wm8804_remove);
 
-#if IS_ENABLED(CONFIG_PM)
 static int wm8804_runtime_resume(struct device *dev)
 {
 	struct wm8804_priv *wm8804 = dev_get_drvdata(dev);
@@ -713,12 +712,10 @@  static int wm8804_runtime_suspend(struct device *dev)
 
 	return 0;
 }
-#endif
 
-const struct dev_pm_ops wm8804_pm = {
-	SET_RUNTIME_PM_OPS(wm8804_runtime_suspend, wm8804_runtime_resume, NULL)
+EXPORT_GPL_DEV_PM_OPS(wm8804_pm) = {
+	RUNTIME_PM_OPS(wm8804_runtime_suspend, wm8804_runtime_resume, NULL)
 };
-EXPORT_SYMBOL_GPL(wm8804_pm);
 
 MODULE_DESCRIPTION("ASoC WM8804 driver");
 MODULE_AUTHOR("Dimitris Papastamos <dp@opensource.wolfsonmicro.com>");

[53/89] ASoC: wm8804: Convert to EXPORT_GPL_DEV_PM_OPS()

Commit Message

Patch