From: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
To: Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>, Jaroslav Kysela <perex@perex.cz>,
Takashi Iwai <tiwai@suse.com>,
Venkata Prasad Potturu <venkataprasad.potturu@amd.com>,
Marian Postevca <posteuca@mutex.one>,
Vijendar Mukunda <Vijendar.Mukunda@amd.com>,
Syed Saba Kareem <Syed.SabaKareem@amd.com>,
Alper Nebi Yasak <alpernebiyasak@gmail.com>,
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
Rander Wang <rander.wang@intel.com>,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
Daniel Baluta <daniel.baluta@nxp.com>,
Ajit Kumar Pandey <AjitKumar.Pandey@amd.com>,
Bard Liao <bard.liao@intel.com>,
Kai Vehmanen <kai.vehmanen@linux.intel.com>
Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel@collabora.com
Subject: [PATCH 3/5] ASoC: amd: vangogh: Switch to {RUNTIME,SYSTEM_SLEEP}_PM_OPS
Date: Sat, 9 Dec 2023 22:32:21 +0200 [thread overview]
Message-ID: <20231209203229.878730-4-cristian.ciocaltea@collabora.com> (raw)
In-Reply-To: <20231209203229.878730-1-cristian.ciocaltea@collabora.com>
Replace the old SET_{RUNTIME,SYSTEM_SLEEP}_PM_OPS() helpers with their
modern alternatives and drop the now unnecessary __maybe_unused
qualifier in the suspend and resume functions.
Additionally, make use of pm_ptr() to ensure the PM ops are dropped when
building with CONFIG_PM disabled.
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
---
sound/soc/amd/vangogh/pci-acp5x.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/sound/soc/amd/vangogh/pci-acp5x.c b/sound/soc/amd/vangogh/pci-acp5x.c
index 10755c07949c..af56ff09f02a 100644
--- a/sound/soc/amd/vangogh/pci-acp5x.c
+++ b/sound/soc/amd/vangogh/pci-acp5x.c
@@ -264,7 +264,7 @@ static int snd_acp5x_probe(struct pci_dev *pci,
return ret;
}
-static int __maybe_unused snd_acp5x_suspend(struct device *dev)
+static int snd_acp5x_suspend(struct device *dev)
{
int ret;
struct acp5x_dev_data *adata;
@@ -279,7 +279,7 @@ static int __maybe_unused snd_acp5x_suspend(struct device *dev)
return ret;
}
-static int __maybe_unused snd_acp5x_resume(struct device *dev)
+static int snd_acp5x_resume(struct device *dev)
{
int ret;
struct acp5x_dev_data *adata;
@@ -294,9 +294,8 @@ static int __maybe_unused snd_acp5x_resume(struct device *dev)
}
static const struct dev_pm_ops acp5x_pm = {
- SET_RUNTIME_PM_OPS(snd_acp5x_suspend,
- snd_acp5x_resume, NULL)
- SET_SYSTEM_SLEEP_PM_OPS(snd_acp5x_suspend, snd_acp5x_resume)
+ RUNTIME_PM_OPS(snd_acp5x_suspend, snd_acp5x_resume, NULL)
+ SYSTEM_SLEEP_PM_OPS(snd_acp5x_suspend, snd_acp5x_resume)
};
static void snd_acp5x_remove(struct pci_dev *pci)
@@ -332,7 +331,7 @@ static struct pci_driver acp5x_driver = {
.probe = snd_acp5x_probe,
.remove = snd_acp5x_remove,
.driver = {
- .pm = &acp5x_pm,
+ .pm = pm_ptr(&acp5x_pm),
}
};
--
2.43.0
next prev parent reply other threads:[~2023-12-09 20:40 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-09 20:32 [PATCH 0/5] Improve AMD ACP Vangogh audio support for Steam Deck OLED Cristian Ciocaltea
2023-12-09 20:32 ` [PATCH 1/5] ASoC: amd: vangogh: Drop conflicting ACPI-based probing Cristian Ciocaltea
2023-12-09 20:32 ` [PATCH 2/5] ASoC: amd: vangogh: Allow probing ACP PCI when SOF is disabled Cristian Ciocaltea
2023-12-09 20:32 ` Cristian Ciocaltea [this message]
2023-12-09 20:32 ` [PATCH 4/5] ASoC: amd: acp-config: Add missing MODULE_DESCRIPTION Cristian Ciocaltea
2023-12-09 20:32 ` [PATCH 5/5] ASoC: amd: acp: Add missing MODULE_DESCRIPTION in mach-common Cristian Ciocaltea
2023-12-11 15:12 ` [PATCH 0/5] Improve AMD ACP Vangogh audio support for Steam Deck OLED Emil Velikov
2023-12-11 17:04 ` Cristian Ciocaltea
2023-12-19 18:06 ` 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=20231209203229.878730-4-cristian.ciocaltea@collabora.com \
--to=cristian.ciocaltea@collabora.com \
--cc=AjitKumar.Pandey@amd.com \
--cc=Syed.SabaKareem@amd.com \
--cc=Vijendar.Mukunda@amd.com \
--cc=alpernebiyasak@gmail.com \
--cc=bard.liao@intel.com \
--cc=broonie@kernel.org \
--cc=daniel.baluta@nxp.com \
--cc=kai.vehmanen@linux.intel.com \
--cc=kernel@collabora.com \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=perex@perex.cz \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=posteuca@mutex.one \
--cc=rander.wang@intel.com \
--cc=tiwai@suse.com \
--cc=venkataprasad.potturu@amd.com \
/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
all inboxes | Powered by JetHome®