]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ALSA: oxygen: Fix dependency on CONFIG_PM_SLEEP
authorTakashi Iwai <tiwai@suse.de>
Thu, 20 Mar 2025 10:57:20 +0000 (11:57 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 20 Mar 2025 10:59:02 +0000 (11:59 +0100)
The conversion to EXPORT_SIMPLE_DEV_PM_OPS() also replaced the pm ops
assignment with pm_ptr() macro, but this made difference from the
original code; it  had conditional with ifdef CONFIG_PM_SLEEP, while
we have now with CONFIG_PM, instead.  This seems causing build errors
with randomconfig.

For fixing the inconsistency, replace pm_ptr() with pm_sleep_ptr().

Fixes: 5ea0a2206b58 ("ALSA: oxygen: Convert to EXPORT_SIMPLE_DEV_PM_OPS()")
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202503201853.7kB0BPRw-lkp@intel.com/
Link: https://patch.msgid.link/20250320105721.10789-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/oxygen/oxygen.c
sound/pci/oxygen/se6x.c
sound/pci/oxygen/virtuoso.c

index 6d0deea47ee6fc80507ba37a7825b620e165a21e..ff7439634d76939d9f802789fff87cb374d57289 100644 (file)
@@ -855,7 +855,7 @@ static struct pci_driver oxygen_driver = {
        .id_table = oxygen_ids,
        .probe = generic_oxygen_probe,
        .driver = {
-               .pm = pm_ptr(&oxygen_pci_pm),
+               .pm = pm_sleep_ptr(&oxygen_pci_pm),
        },
 };
 
index c1bb9dd1cd540ea9ee7454613a7e1ea7ab1ab2ae..9d009015d97ec3b2145222da6b5c77f6a2a6de89 100644 (file)
@@ -138,7 +138,7 @@ static struct pci_driver se6x_driver = {
        .id_table = se6x_ids,
        .probe = se6x_probe,
        .driver = {
-               .pm = pm_ptr(&oxygen_pci_pm),
+               .pm = pm_sleep_ptr(&oxygen_pci_pm),
        },
        .shutdown = oxygen_pci_shutdown,
 };
index 0bfe6d8dde3e101cf001f71d2ed5be7dd90051db..ded62199da7fab50e51c336f96a07ec08df4f6dc 100644 (file)
@@ -83,7 +83,7 @@ static struct pci_driver xonar_driver = {
        .id_table = xonar_ids,
        .probe = xonar_probe,
        .driver = {
-               .pm = pm_ptr(&oxygen_pci_pm),
+               .pm = pm_sleep_ptr(&oxygen_pci_pm),
        },
        .shutdown = oxygen_pci_shutdown,
 };