From: Takashi Iwai <tiwai@suse.de>
To: Mark Brown <broonie@kernel.org>
Cc: linux-sound@vger.kernel.org,
Cezary Rojewski <cezary.rojewski@intel.com>,
Takashi Iwai <tiwai@suse.de>
Subject: [PATCH v2 61/88] ASoC: intel: avs: Convert to RUNTIME_PM_OPS()
Date: Mon, 17 Mar 2025 10:55:23 +0100 [thread overview]
Message-ID: <20250317095603.20073-62-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: Cezary Rojewski <cezary.rojewski@intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
sound/soc/intel/avs/core.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/sound/soc/intel/avs/core.c b/sound/soc/intel/avs/core.c
index 0e750e9e01d9..8fbf33e30dfc 100644
--- a/sound/soc/intel/avs/core.c
+++ b/sound/soc/intel/avs/core.c
@@ -612,7 +612,7 @@ static int avs_suspend_standby(struct avs_dev *adev)
return 0;
}
-static int __maybe_unused avs_suspend_common(struct avs_dev *adev, bool low_power)
+static int avs_suspend_common(struct avs_dev *adev, bool low_power)
{
struct hdac_bus *bus = &adev->base.core;
int ret;
@@ -673,7 +673,7 @@ static int avs_resume_standby(struct avs_dev *adev)
return 0;
}
-static int __maybe_unused avs_resume_common(struct avs_dev *adev, bool low_power, bool purge)
+static int avs_resume_common(struct avs_dev *adev, bool low_power, bool purge)
{
struct hdac_bus *bus = &adev->base.core;
int ret;
@@ -696,41 +696,41 @@ static int __maybe_unused avs_resume_common(struct avs_dev *adev, bool low_power
return 0;
}
-static int __maybe_unused avs_suspend(struct device *dev)
+static int avs_suspend(struct device *dev)
{
return avs_suspend_common(to_avs_dev(dev), true);
}
-static int __maybe_unused avs_resume(struct device *dev)
+static int avs_resume(struct device *dev)
{
return avs_resume_common(to_avs_dev(dev), true, true);
}
-static int __maybe_unused avs_runtime_suspend(struct device *dev)
+static int avs_runtime_suspend(struct device *dev)
{
return avs_suspend_common(to_avs_dev(dev), true);
}
-static int __maybe_unused avs_runtime_resume(struct device *dev)
+static int avs_runtime_resume(struct device *dev)
{
return avs_resume_common(to_avs_dev(dev), true, false);
}
-static int __maybe_unused avs_freeze(struct device *dev)
+static int avs_freeze(struct device *dev)
{
return avs_suspend_common(to_avs_dev(dev), false);
}
-static int __maybe_unused avs_thaw(struct device *dev)
+static int avs_thaw(struct device *dev)
{
return avs_resume_common(to_avs_dev(dev), false, true);
}
-static int __maybe_unused avs_poweroff(struct device *dev)
+static int avs_poweroff(struct device *dev)
{
return avs_suspend_common(to_avs_dev(dev), false);
}
-static int __maybe_unused avs_restore(struct device *dev)
+static int avs_restore(struct device *dev)
{
return avs_resume_common(to_avs_dev(dev), false, true);
}
@@ -742,7 +742,7 @@ static const struct dev_pm_ops avs_dev_pm = {
.thaw = avs_thaw,
.poweroff = avs_poweroff,
.restore = avs_restore,
- SET_RUNTIME_PM_OPS(avs_runtime_suspend, avs_runtime_resume, NULL)
+ RUNTIME_PM_OPS(avs_runtime_suspend, avs_runtime_resume, NULL)
};
static const struct avs_sram_spec skl_sram_spec = {
@@ -893,7 +893,7 @@ static struct pci_driver avs_pci_driver = {
.shutdown = avs_pci_shutdown,
.dev_groups = avs_attr_groups,
.driver = {
- .pm = &avs_dev_pm,
+ .pm = pm_ptr(&avs_dev_pm),
},
};
module_pci_driver(avs_pci_driver);
--
2.43.0
next prev parent reply other threads:[~2025-03-17 9:59 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 ` [PATCH v2 19/88] ASoC: lpass: Convert to RUNTIME_PM_OPS() Takashi Iwai
2025-03-17 9:54 ` [PATCH v2 20/88] ASoC: max98090: Convert to RUNTIME_PM_OPS() & co 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 ` Takashi Iwai [this message]
2025-03-17 10:04 ` [PATCH v2 61/88] ASoC: intel: avs: Convert to RUNTIME_PM_OPS() 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-62-tiwai@suse.de \
--to=tiwai@suse.de \
--cc=broonie@kernel.org \
--cc=cezary.rojewski@intel.com \
--cc=linux-sound@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.