Skip to contentSkip to conversation

ALSA: hda: acpi: Use SYSTEM_SLEEP_PM_OPS()

PATCH In review Takashi Iwai 3 participants 3 messages May 22, 2025 Sound

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ALSA: hda: acpi: Use SYSTEM_SLEEP_PM_OPS()

The dev_pm_ops definition must be SYSTEM_SLEEP_PM_OPS() instead of SET_SYSTEM_SLEEP_PM_OPS(); otherwise it leads compile warnings without CONFIG_PM_SLEEP. The latest patch version I took was back to an old macro (likely mistakenly), and I overlooked it at applying. Fix it now.

Fixes 4b214c9bbe26 ("ALSA: hda - Add new driver for HDA controllers listed via ACPI")
---
 sound/pci/hda/hda_acpi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/hda/hda_acpi.c +1 -1
index c90865ca876e..513f8fde198b 100644
@@ -293,7 +293,7 @@ static int hda_acpi_resume(struct device *dev)
 }
 
 static const struct dev_pm_ops hda_acpi_pm = {
-	SET_SYSTEM_SLEEP_PM_OPS(hda_acpi_suspend, hda_acpi_resume)
+	SYSTEM_SLEEP_PM_OPS(hda_acpi_suspend, hda_acpi_resume)
 };
 
 struct hda_data nvidia_hda_data = {
Signature · 1 line
2.49.0
Reviewed-by on v1 1/1
#1 lore raw

Mea culpa.

Quoted 30 lines · Takashi Iwai

The dev_pm_ops definition must be SYSTEM_SLEEP_PM_OPS() instead of SET_SYSTEM_SLEEP_PM_OPS(); otherwise it leads compile warnings without CONFIG_PM_SLEEP. The latest patch version I took was back to an old macro (likely mistakenly), and I overlooked it at applying. Fix it now.

Fixes 4b214c9bbe26 ("ALSA: hda - Add new driver for HDA controllers listed via ACPI")
---
 sound/pci/hda/hda_acpi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/hda/hda_acpi.c +1 -1
index c90865ca876e..513f8fde198b 100644
@@ -293,7 +293,7 @@ static int hda_acpi_resume(struct device *dev)
 }
 
 static const struct dev_pm_ops hda_acpi_pm = {
-	SET_SYSTEM_SLEEP_PM_OPS(hda_acpi_suspend, hda_acpi_resume)
+	SYSTEM_SLEEP_PM_OPS(hda_acpi_suspend, hda_acpi_resume)
 };
 
 struct hda_data nvidia_hda_data = {
Signature · 1 line
2.49.0
Acked-by Tested-by on v1 1/1
#2 lore raw
In reply to Takashi Iwai
Quoted 10 lines · Takashi Iwai

The dev_pm_ops definition must be SYSTEM_SLEEP_PM_OPS() instead of SET_SYSTEM_SLEEP_PM_OPS(); otherwise it leads compile warnings without CONFIG_PM_SLEEP. The latest patch version I took was back to an old macro (likely mistakenly), and I overlooked it at applying. Fix it now.

Fixes 4b214c9bbe26 ("ALSA: hda - Add new driver for HDA controllers listed via ACPI")

Thanks.

Quoted 17 lines
---
 sound/pci/hda/hda_acpi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/pci/hda/hda_acpi.c +1 -1
index c90865ca876e..513f8fde198b 100644
@@ -293,7 +293,7 @@ static int hda_acpi_resume(struct device *dev)
 }
 
 static const struct dev_pm_ops hda_acpi_pm = {
-	SET_SYSTEM_SLEEP_PM_OPS(hda_acpi_suspend, hda_acpi_resume)
+	SYSTEM_SLEEP_PM_OPS(hda_acpi_suspend, hda_acpi_resume)
 };
 
 struct hda_data nvidia_hda_data = {
Signature · 1 line
~Randy