Skip to content

Commit ee3d1f0

Browse files
committed
ALSA: oxygen: Fix dependency on CONFIG_PM_SLEEP
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: 5ea0a22 ("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>
1 parent 765fee2 commit ee3d1f0

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

sound/pci/oxygen/oxygen.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,7 @@ static struct pci_driver oxygen_driver = {
855855
.id_table = oxygen_ids,
856856
.probe = generic_oxygen_probe,
857857
.driver = {
858-
.pm = pm_ptr(&oxygen_pci_pm),
858+
.pm = pm_sleep_ptr(&oxygen_pci_pm),
859859
},
860860
};
861861

sound/pci/oxygen/se6x.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ static struct pci_driver se6x_driver = {
138138
.id_table = se6x_ids,
139139
.probe = se6x_probe,
140140
.driver = {
141-
.pm = pm_ptr(&oxygen_pci_pm),
141+
.pm = pm_sleep_ptr(&oxygen_pci_pm),
142142
},
143143
.shutdown = oxygen_pci_shutdown,
144144
};

sound/pci/oxygen/virtuoso.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ static struct pci_driver xonar_driver = {
8383
.id_table = xonar_ids,
8484
.probe = xonar_probe,
8585
.driver = {
86-
.pm = pm_ptr(&oxygen_pci_pm),
86+
.pm = pm_sleep_ptr(&oxygen_pci_pm),
8787
},
8888
.shutdown = oxygen_pci_shutdown,
8989
};

0 commit comments

Comments
 (0)