From: Takashi Iwai <tiwai@suse.de>
To: Mark Brown <broonie@kernel.org>
Cc: linux-sound@vger.kernel.org,
Srinivas Kandagatla <srinivas.kandagatla@linaro.org>,
Takashi Iwai <tiwai@suse.de>
Subject: [PATCH v2 19/88] ASoC: lpass: Convert to RUNTIME_PM_OPS()
Date: Mon, 17 Mar 2025 10:54:41 +0100 [thread overview]
Message-ID: <20250317095603.20073-20-tiwai@suse.de> (raw)
In-Reply-To: <20250317095603.20073-1-tiwai@suse.de>
Use the newer RUNTIME_PM_OPS() macro instead of SET_RUNTIME_PM_OPS()
together with pm_ptr(), which allows us dropping ugly __maybe_unused
attributes.
This optimizes slightly when CONFIG_PM is disabled, too.
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
sound/soc/codecs/lpass-rx-macro.c | 8 ++++----
sound/soc/codecs/lpass-tx-macro.c | 8 ++++----
sound/soc/codecs/lpass-va-macro.c | 8 ++++----
sound/soc/codecs/lpass-wsa-macro.c | 8 ++++----
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/sound/soc/codecs/lpass-rx-macro.c b/sound/soc/codecs/lpass-rx-macro.c
index febbbe073962..45a6b83808b2 100644
--- a/sound/soc/codecs/lpass-rx-macro.c
+++ b/sound/soc/codecs/lpass-rx-macro.c
@@ -3963,7 +3963,7 @@ static const struct of_device_id rx_macro_dt_match[] = {
};
MODULE_DEVICE_TABLE(of, rx_macro_dt_match);
-static int __maybe_unused rx_macro_runtime_suspend(struct device *dev)
+static int rx_macro_runtime_suspend(struct device *dev)
{
struct rx_macro *rx = dev_get_drvdata(dev);
@@ -3977,7 +3977,7 @@ static int __maybe_unused rx_macro_runtime_suspend(struct device *dev)
return 0;
}
-static int __maybe_unused rx_macro_runtime_resume(struct device *dev)
+static int rx_macro_runtime_resume(struct device *dev)
{
struct rx_macro *rx = dev_get_drvdata(dev);
int ret;
@@ -4012,7 +4012,7 @@ static int __maybe_unused rx_macro_runtime_resume(struct device *dev)
}
static const struct dev_pm_ops rx_macro_pm_ops = {
- SET_RUNTIME_PM_OPS(rx_macro_runtime_suspend, rx_macro_runtime_resume, NULL)
+ RUNTIME_PM_OPS(rx_macro_runtime_suspend, rx_macro_runtime_resume, NULL)
};
static struct platform_driver rx_macro_driver = {
@@ -4020,7 +4020,7 @@ static struct platform_driver rx_macro_driver = {
.name = "rx_macro",
.of_match_table = rx_macro_dt_match,
.suppress_bind_attrs = true,
- .pm = &rx_macro_pm_ops,
+ .pm = pm_ptr(&rx_macro_pm_ops),
},
.probe = rx_macro_probe,
.remove = rx_macro_remove,
diff --git a/sound/soc/codecs/lpass-tx-macro.c b/sound/soc/codecs/lpass-tx-macro.c
index a134584acf90..27bae58f4072 100644
--- a/sound/soc/codecs/lpass-tx-macro.c
+++ b/sound/soc/codecs/lpass-tx-macro.c
@@ -2400,7 +2400,7 @@ static void tx_macro_remove(struct platform_device *pdev)
lpass_macro_pds_exit(tx->pds);
}
-static int __maybe_unused tx_macro_runtime_suspend(struct device *dev)
+static int tx_macro_runtime_suspend(struct device *dev)
{
struct tx_macro *tx = dev_get_drvdata(dev);
@@ -2414,7 +2414,7 @@ static int __maybe_unused tx_macro_runtime_suspend(struct device *dev)
return 0;
}
-static int __maybe_unused tx_macro_runtime_resume(struct device *dev)
+static int tx_macro_runtime_resume(struct device *dev)
{
struct tx_macro *tx = dev_get_drvdata(dev);
int ret;
@@ -2450,7 +2450,7 @@ static int __maybe_unused tx_macro_runtime_resume(struct device *dev)
}
static const struct dev_pm_ops tx_macro_pm_ops = {
- SET_RUNTIME_PM_OPS(tx_macro_runtime_suspend, tx_macro_runtime_resume, NULL)
+ RUNTIME_PM_OPS(tx_macro_runtime_suspend, tx_macro_runtime_resume, NULL)
};
static const struct tx_macro_data lpass_ver_9 = {
@@ -2531,7 +2531,7 @@ static struct platform_driver tx_macro_driver = {
.name = "tx_macro",
.of_match_table = tx_macro_dt_match,
.suppress_bind_attrs = true,
- .pm = &tx_macro_pm_ops,
+ .pm = pm_ptr(&tx_macro_pm_ops),
},
.probe = tx_macro_probe,
.remove = tx_macro_remove,
diff --git a/sound/soc/codecs/lpass-va-macro.c b/sound/soc/codecs/lpass-va-macro.c
index c781da476240..74ada6e77526 100644
--- a/sound/soc/codecs/lpass-va-macro.c
+++ b/sound/soc/codecs/lpass-va-macro.c
@@ -1674,7 +1674,7 @@ static void va_macro_remove(struct platform_device *pdev)
lpass_macro_pds_exit(va->pds);
}
-static int __maybe_unused va_macro_runtime_suspend(struct device *dev)
+static int va_macro_runtime_suspend(struct device *dev)
{
struct va_macro *va = dev_get_drvdata(dev);
@@ -1689,7 +1689,7 @@ static int __maybe_unused va_macro_runtime_suspend(struct device *dev)
return 0;
}
-static int __maybe_unused va_macro_runtime_resume(struct device *dev)
+static int va_macro_runtime_resume(struct device *dev)
{
struct va_macro *va = dev_get_drvdata(dev);
int ret;
@@ -1717,7 +1717,7 @@ static int __maybe_unused va_macro_runtime_resume(struct device *dev)
static const struct dev_pm_ops va_macro_pm_ops = {
- SET_RUNTIME_PM_OPS(va_macro_runtime_suspend, va_macro_runtime_resume, NULL)
+ RUNTIME_PM_OPS(va_macro_runtime_suspend, va_macro_runtime_resume, NULL)
};
static const struct of_device_id va_macro_dt_match[] = {
@@ -1735,7 +1735,7 @@ static struct platform_driver va_macro_driver = {
.name = "va_macro",
.of_match_table = va_macro_dt_match,
.suppress_bind_attrs = true,
- .pm = &va_macro_pm_ops,
+ .pm = pm_ptr(&va_macro_pm_ops),
},
.probe = va_macro_probe,
.remove = va_macro_remove,
diff --git a/sound/soc/codecs/lpass-wsa-macro.c b/sound/soc/codecs/lpass-wsa-macro.c
index c989d82d1d3c..b261fa373e65 100644
--- a/sound/soc/codecs/lpass-wsa-macro.c
+++ b/sound/soc/codecs/lpass-wsa-macro.c
@@ -2900,7 +2900,7 @@ static void wsa_macro_remove(struct platform_device *pdev)
clk_disable_unprepare(wsa->fsgen);
}
-static int __maybe_unused wsa_macro_runtime_suspend(struct device *dev)
+static int wsa_macro_runtime_suspend(struct device *dev)
{
struct wsa_macro *wsa = dev_get_drvdata(dev);
@@ -2914,7 +2914,7 @@ static int __maybe_unused wsa_macro_runtime_suspend(struct device *dev)
return 0;
}
-static int __maybe_unused wsa_macro_runtime_resume(struct device *dev)
+static int wsa_macro_runtime_resume(struct device *dev)
{
struct wsa_macro *wsa = dev_get_drvdata(dev);
int ret;
@@ -2950,7 +2950,7 @@ static int __maybe_unused wsa_macro_runtime_resume(struct device *dev)
}
static const struct dev_pm_ops wsa_macro_pm_ops = {
- SET_RUNTIME_PM_OPS(wsa_macro_runtime_suspend, wsa_macro_runtime_resume, NULL)
+ RUNTIME_PM_OPS(wsa_macro_runtime_suspend, wsa_macro_runtime_resume, NULL)
};
static const struct of_device_id wsa_macro_dt_match[] = {
@@ -2977,7 +2977,7 @@ static struct platform_driver wsa_macro_driver = {
.driver = {
.name = "wsa_macro",
.of_match_table = wsa_macro_dt_match,
- .pm = &wsa_macro_pm_ops,
+ .pm = pm_ptr(&wsa_macro_pm_ops),
},
.probe = wsa_macro_probe,
.remove = wsa_macro_remove,
--
2.43.0
next prev parent reply other threads:[~2025-03-17 9:56 UTC|newest]
Thread overview: 94+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-17 9:54 [PATCH v2 00/88] ASoC: Convert to modern PM macros Takashi Iwai
2025-03-17 9:54 ` [PATCH v2 01/88] ASoC: au1x: Convert to DEFINE_SIMPLE_DEV_PM_OPS() Takashi Iwai
2025-03-17 9:54 ` [PATCH v2 02/88] ASoC: ak4375: Convert to RUNTIME_PM_OPS() & co Takashi Iwai
2025-03-17 9:54 ` [PATCH v2 03/88] ASoC: ak4458: " Takashi Iwai
2025-03-17 9:54 ` [PATCH v2 04/88] ASoC: ak5558: " Takashi Iwai
2025-03-17 9:54 ` [PATCH v2 05/88] ASoC: cs35l32: Convert to RUNTIME_PM_OPS() Takashi Iwai
2025-03-17 9:54 ` [PATCH v2 06/88] ASoC: cs35l33: " Takashi Iwai
2025-03-17 9:54 ` [PATCH v2 07/88] ASoC: cs35l34: " Takashi Iwai
2025-03-17 9:54 ` [PATCH v2 08/88] ASoC: cs4234: " Takashi Iwai
2025-03-17 9:54 ` [PATCH v2 09/88] ASoC: cs42l42: Convert to RUNTIME_PM_OPS() & co Takashi Iwai
2025-03-17 9:54 ` [PATCH v2 10/88] ASoC: cs42l51: Convert to SYSTEM_SLEEP_PM_OPS() Takashi Iwai
2025-03-17 9:54 ` [PATCH v2 11/88] ASoC: cs42l83: " Takashi Iwai
2025-03-17 9:54 ` [PATCH v2 12/88] ASoC: cs42xx8: Convert to EXPORT_GPL_DEV_PM_OPS() Takashi Iwai
2025-03-17 9:54 ` [PATCH v2 13/88] ASoC: cs43130: Convert to RUNTIME_PM_OPS() Takashi Iwai
2025-03-17 9:54 ` [PATCH v2 14/88] ASoC: cs4349: " Takashi Iwai
2025-03-17 9:54 ` [PATCH v2 15/88] ASoC: cs53l30: " Takashi Iwai
2025-03-17 9:54 ` [PATCH v2 16/88] ASoC: cx2072x: Convert to RUNTIME_PM_OPS() & co Takashi Iwai
2025-03-17 9:54 ` [PATCH v2 17/88] ASoC: da7213: " Takashi Iwai
2025-03-17 9:54 ` [PATCH v2 18/88] ASoC: hdac_hdmi: " Takashi Iwai
2025-03-17 9:54 ` Takashi Iwai [this message]
2025-03-17 9:54 ` [PATCH v2 20/88] ASoC: max98090: " Takashi Iwai
2025-03-17 9:54 ` [PATCH v2 21/88] ASoC: max98373: " Takashi Iwai
2025-03-17 9:54 ` [PATCH v2 22/88] ASoC: max98390: Convert to SYSTEM_SLEEP_PM_OPS() Takashi Iwai
2025-03-17 9:54 ` [PATCH v2 23/88] ASoC: max98396: " Takashi Iwai
2025-03-17 9:54 ` [PATCH v2 24/88] ASoC: max98520: " Takashi Iwai
2025-03-17 9:54 ` [PATCH v2 25/88] ASoC: max9860: Convert to RUNTIME_PM_OPS() Takashi Iwai
2025-03-17 9:54 ` [PATCH v2 26/88] ASoC: max98927: Convert to SYSTEM_SLEEP_PM_OPS() Takashi Iwai
2025-03-17 9:54 ` [PATCH v2 27/88] ASoC: mt6660: Convert to RUNTIME_PM_OPS() Takashi Iwai
2025-03-17 9:54 ` [PATCH v2 28/88] ASoC: pcm512x: Convert to EXPORT_GPL_DEV_PM_OPS() Takashi Iwai
2025-03-17 9:54 ` [PATCH v2 29/88] ASoC: rt1017-sdca-sdw: Convert to RUNTIME_PM_OPS() & co Takashi Iwai
2025-03-17 9:54 ` [PATCH v2 30/88] ASoC: rt1308-sdw: " Takashi Iwai
2025-03-17 9:54 ` [PATCH v2 31/88] ASoC: rt1316-sdw: " Takashi Iwai
2025-03-17 9:54 ` [PATCH v2 32/88] ASoC: rt1318-sdw: " Takashi Iwai
2025-03-17 9:54 ` [PATCH v2 33/88] ASoC: rt1320-sdw: " Takashi Iwai
2025-03-17 9:54 ` [PATCH v2 34/88] ASoC: rt5514: Convert to SYSTEM_SLEEP_PM_OPS() Takashi Iwai
2025-03-17 9:54 ` [PATCH v2 35/88] ASoC: rt5645: " Takashi Iwai
2025-03-17 9:54 ` [PATCH v2 36/88] ASoC: rt5682-sdw: Convert to RUNTIME_PM_OPS() & co Takashi Iwai
2025-03-17 9:54 ` [PATCH v2 37/88] ASoC: rt700-sdw: " Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 38/88] ASoC: rt711: " Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 39/88] ASoC: rt712: " Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 40/88] ASoC: rt715: " Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 41/88] ASoC: rt721: " Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 42/88] ASoC: rt722: " Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 43/88] ASoC: rt9120: Convert to RUNTIME_PM_OPS() Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 44/88] ASoC: rtq9128: " Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 45/88] ASoC: tas2552: " Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 46/88] ASoC: ts3a227e: Convert to SYSTEM_SLEEP_PM_OPS() Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 47/88] ASoC: wcd937x: Convert to RUNTIME_PM_OPS() Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 48/88] ASoC: wcd938x: " Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 49/88] ASoC: wcd939x: " Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 50/88] ASoC: wm2200: " Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 51/88] ASoC: wm5100: " Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 52/88] ASoC: wm8804: Convert to EXPORT_GPL_DEV_PM_OPS() Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 53/88] ASoC: wm8962: Convert to RUNTIME_PM_OPS() & co Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 54/88] ASoC: wm8994: Convert to SYSTEM_SLEEP_PM_OPS() Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 55/88] ASoC: wsa881x: Convert to RUNTIME_PM_OPS() Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 56/88] ASoC: wsa883x: " Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 57/88] ASoC: wsa884x: " Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 58/88] ASoC: dwc: " Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 59/88] ASoC: fsl: Convert to RUNTIME_PM_OPS() and co Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 60/88] ASoC: img: " Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 61/88] ASoC: intel: avs: Convert to RUNTIME_PM_OPS() Takashi Iwai
2025-03-17 10:04 ` Cezary Rojewski
2025-03-17 9:55 ` [PATCH v2 62/88] ASoC: intel: catpt: Convert to RUNTIME_PM_OPS() & co Takashi Iwai
2025-03-17 10:08 ` Cezary Rojewski
2025-03-17 10:13 ` Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 63/88] ASoC: mediatek: mt2701: Convert to RUNTIME_PM_OPS() Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 64/88] ASoC: mediatek: mt6797: " Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 65/88] ASoC: mediatek: mt7986: " Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 66/88] ASoC: mediatek: mt8173: " Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 67/88] ASoC: mediatek: mt8183: " Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 68/88] ASoC: mediatek: mt8186: " Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 69/88] ASoC: mediatek: mt8188: " Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 70/88] ASoC: mediatek: mt8192: " Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 71/88] ASoC: mediatek: mt8195: " Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 72/88] ASoC: mediatek: mt8365: Convert to RUNTIME_PM_OPS() & co Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 73/88] ASoC: qcom: Convert to SYSTEM_SLEEP_PM_OPS() Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 74/88] ASoC: rcar: " Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 75/88] ASoC: rockchip: Convert to RUNTIME_PM_OPS() & co Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 76/88] ASoC: samsung: " Takashi Iwai
2025-03-17 11:39 ` Sylwester Nawrocki
2025-03-17 9:55 ` [PATCH v2 77/88] ASoC: SOF: acpi: Convert to EXPORT_NS_DEV_PM_OPS() Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 78/88] ASoC: SOF: pci: " Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 79/88] ASoC: SOF: of: Convert to EXPORT_DEV_PM_OPS() Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 80/88] ASoC: stm: Convert to SYSTEM_SLEEP_PM_OPS() Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 81/88] ASoC: sunxi: Convert to RUNTIME_PM_OPS() Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 82/88] ASoC: tegra186: Convert to RUNTIME_PM_OPS() & co Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 83/88] ASoC: tegra210: " Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 84/88] ASoC: tegra20: " Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 85/88] ASoC: tegra30: " Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 86/88] ASoC: xtensa: Convert to RUNTIME_PM_OPS() Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 87/88] ASoC: amd: Convert to RUNTIME_PM_OPS() & co Takashi Iwai
2025-03-17 9:55 ` [PATCH v2 88/88] ASoC: pcm3168a: Convert to EXPORT_GPL_DEV_PM_OPS() Takashi Iwai
2025-03-17 21:54 ` [PATCH v2 00/88] ASoC: Convert to modern PM macros Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250317095603.20073-20-tiwai@suse.de \
--to=tiwai@suse.de \
--cc=broonie@kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=srinivas.kandagatla@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox