diff options
| author | Takashi Iwai <tiwai@suse.de> | 2024-03-11 09:12:58 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2024-03-11 09:12:58 +0100 |
| commit | 14b9e4ab71b3f58828c107d7158e52da1e670d1c (patch) | |
| tree | c47d143c8315a02985cce3e0d6d63b07b5f865a2 /sound/pci/als4000.c | |
| parent | 21e59fe2f7221cdc77b2e5ef90a04c302b237053 (diff) | |
| parent | 6fa9ba2d6278da69ef11c3c8e1ac6163437d1fca (diff) | |
Merge branch 'for-next' into for-linus
Prep for 6.9 merge.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/als4000.c')
| -rw-r--r-- | sound/pci/als4000.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sound/pci/als4000.c b/sound/pci/als4000.c index f33aeb692a11..022473594c73 100644 --- a/sound/pci/als4000.c +++ b/sound/pci/als4000.c @@ -936,7 +936,6 @@ static int snd_card_als4000_probe(struct pci_dev *pci, return snd_card_free_on_error(&pci->dev, __snd_card_als4000_probe(pci, pci_id)); } -#ifdef CONFIG_PM_SLEEP static int snd_als4000_suspend(struct device *dev) { struct snd_card *card = dev_get_drvdata(dev); @@ -968,18 +967,14 @@ static int snd_als4000_resume(struct device *dev) return 0; } -static SIMPLE_DEV_PM_OPS(snd_als4000_pm, snd_als4000_suspend, snd_als4000_resume); -#define SND_ALS4000_PM_OPS &snd_als4000_pm -#else -#define SND_ALS4000_PM_OPS NULL -#endif /* CONFIG_PM_SLEEP */ +static DEFINE_SIMPLE_DEV_PM_OPS(snd_als4000_pm, snd_als4000_suspend, snd_als4000_resume); static struct pci_driver als4000_driver = { .name = KBUILD_MODNAME, .id_table = snd_als4000_ids, .probe = snd_card_als4000_probe, .driver = { - .pm = SND_ALS4000_PM_OPS, + .pm = &snd_als4000_pm, }, }; |