[10/89] ASoC: cs42l42: Convert to RUNTIME_PM_OPS() & co

Message ID	20250313174139.29942-11-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 D0691155CBD for <linux-sound@vger.kernel.org>; Thu, 13 Mar 2025 17:42:07 +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 10/89] ASoC: cs42l42: Convert to RUNTIME_PM_OPS() & co Date: Thu, 13 Mar 2025 18:40:15 +0100 Message-ID: <20250313174139.29942-11-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-11-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 10/89] ASoC: cs42l42: Convert to RUNTIME_PM_OPS() & co
Date: Thu, 13 Mar 2025 18:40:15 +0100
Message-ID: <20250313174139.29942-11-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 RUNTIE_PM_OPS() and SYSTEM_SLEEP_PM_OPS() macros instead
of SET_RUNTIME_PM_OPS() and SET_SYSTEM_SLEEP_PM_OPS() together with
pm_ptr(), which allows us dropping ugly __maybe_unused attributes.

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/cs42l42-i2c.c |  6 +++---
 sound/soc/codecs/cs42l42-sdw.c | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/sound/soc/codecs/cs42l42-i2c.c b/sound/soc/codecs/cs42l42-i2c.c
index 8a1d5c7a61d7..98b6718ccabf 100644
--- a/sound/soc/codecs/cs42l42-i2c.c
+++ b/sound/soc/codecs/cs42l42-i2c.c
@@ -48,7 +48,7 @@  static void cs42l42_i2c_remove(struct i2c_client *i2c_client)
 	cs42l42_common_remove(cs42l42);
 }
 
-static int __maybe_unused cs42l42_i2c_resume(struct device *dev)
+static int cs42l42_i2c_resume(struct device *dev)
 {
 	int ret;
 
@@ -62,7 +62,7 @@  static int __maybe_unused cs42l42_i2c_resume(struct device *dev)
 }
 
 static const struct dev_pm_ops cs42l42_i2c_pm_ops = {
-	SET_SYSTEM_SLEEP_PM_OPS(cs42l42_suspend, cs42l42_i2c_resume)
+	SYSTEM_SLEEP_PM_OPS(cs42l42_suspend, cs42l42_i2c_resume)
 };
 
 static const struct of_device_id __maybe_unused cs42l42_of_match[] = {
@@ -87,7 +87,7 @@  MODULE_DEVICE_TABLE(i2c, cs42l42_id);
 static struct i2c_driver cs42l42_i2c_driver = {
 	.driver = {
 		.name = "cs42l42",
-		.pm = &cs42l42_i2c_pm_ops,
+		.pm = pm_ptr(&cs42l42_i2c_pm_ops),
 		.of_match_table = of_match_ptr(cs42l42_of_match),
 		.acpi_match_table = ACPI_PTR(cs42l42_acpi_match),
 		},
diff --git a/sound/soc/codecs/cs42l42-sdw.c b/sound/soc/codecs/cs42l42-sdw.c
index ae1401b250a3..f837c7eff10b 100644
--- a/sound/soc/codecs/cs42l42-sdw.c
+++ b/sound/soc/codecs/cs42l42-sdw.c
@@ -411,7 +411,7 @@  static const struct sdw_slave_ops cs42l42_sdw_ops = {
 	.port_prep = cs42l42_sdw_port_prep,
 };
 
-static int __maybe_unused cs42l42_sdw_runtime_suspend(struct device *dev)
+static int cs42l42_sdw_runtime_suspend(struct device *dev)
 {
 	struct cs42l42_private *cs42l42 = dev_get_drvdata(dev);
 
@@ -426,11 +426,11 @@  static int __maybe_unused cs42l42_sdw_runtime_suspend(struct device *dev)
 	return 0;
 }
 
-static const struct reg_sequence __maybe_unused cs42l42_soft_reboot_seq[] = {
+static const struct reg_sequence cs42l42_soft_reboot_seq[] = {
 	REG_SEQ0(CS42L42_SOFT_RESET_REBOOT, 0x1e),
 };
 
-static int __maybe_unused cs42l42_sdw_handle_unattach(struct cs42l42_private *cs42l42)
+static int cs42l42_sdw_handle_unattach(struct cs42l42_private *cs42l42)
 {
 	struct sdw_slave *peripheral = cs42l42->sdw_peripheral;
 
@@ -460,7 +460,7 @@  static int __maybe_unused cs42l42_sdw_handle_unattach(struct cs42l42_private *cs
 	return 0;
 }
 
-static int __maybe_unused cs42l42_sdw_runtime_resume(struct device *dev)
+static int cs42l42_sdw_runtime_resume(struct device *dev)
 {
 	static const unsigned int ts_dbnce_ms[] = { 0, 125, 250, 500, 750, 1000, 1250, 1500};
 	struct cs42l42_private *cs42l42 = dev_get_drvdata(dev);
@@ -491,7 +491,7 @@  static int __maybe_unused cs42l42_sdw_runtime_resume(struct device *dev)
 	return 0;
 }
 
-static int __maybe_unused cs42l42_sdw_resume(struct device *dev)
+static int cs42l42_sdw_resume(struct device *dev)
 {
 	struct cs42l42_private *cs42l42 = dev_get_drvdata(dev);
 	int ret;
@@ -596,8 +596,8 @@  static int cs42l42_sdw_remove(struct sdw_slave *peripheral)
 }
 
 static const struct dev_pm_ops cs42l42_sdw_pm = {
-	SET_SYSTEM_SLEEP_PM_OPS(cs42l42_suspend, cs42l42_sdw_resume)
-	SET_RUNTIME_PM_OPS(cs42l42_sdw_runtime_suspend, cs42l42_sdw_runtime_resume, NULL)
+	SYSTEM_SLEEP_PM_OPS(cs42l42_suspend, cs42l42_sdw_resume)
+	RUNTIME_PM_OPS(cs42l42_sdw_runtime_suspend, cs42l42_sdw_runtime_resume, NULL)
 };
 
 static const struct sdw_device_id cs42l42_sdw_id[] = {
@@ -609,7 +609,7 @@  MODULE_DEVICE_TABLE(sdw, cs42l42_sdw_id);
 static struct sdw_driver cs42l42_sdw_driver = {
 	.driver = {
 		.name = "cs42l42-sdw",
-		.pm = &cs42l42_sdw_pm,
+		.pm = pm_ptr(&cs42l42_sdw_pm),
 	},
 	.probe = cs42l42_sdw_probe,
 	.remove = cs42l42_sdw_remove,

[10/89] ASoC: cs42l42: Convert to RUNTIME_PM_OPS() & co

Commit Message

Patch