Commit 081364d7 authored by Tasos Sahanidis's avatar Tasos Sahanidis Committed by Takashi Iwai

ALSA: ymfpci: Switch to DEFINE_SIMPLE_DEV_PM_OPS()

Since commit 1a3c7bb0 ("PM: core: Add new *_PM_OPS macros, deprecate
old ones") SIMPLE_DEV_PM_OPS has been marked deprecated.

The intent is to remove CONFIG_PM_SLEEP guards for PM callbacks. As such
the ifdefs are now removed.
Signed-off-by: default avatarTasos Sahanidis <tasos@tasossah.com>
Link: https://lore.kernel.org/r/20230329041440.177363-2-tasos@tasossah.comSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent f09467e0
...@@ -352,11 +352,9 @@ static struct pci_driver ymfpci_driver = { ...@@ -352,11 +352,9 @@ static struct pci_driver ymfpci_driver = {
.name = KBUILD_MODNAME, .name = KBUILD_MODNAME,
.id_table = snd_ymfpci_ids, .id_table = snd_ymfpci_ids,
.probe = snd_card_ymfpci_probe, .probe = snd_card_ymfpci_probe,
#ifdef CONFIG_PM_SLEEP
.driver = { .driver = {
.pm = &snd_ymfpci_pm, .pm = pm_sleep_ptr(&snd_ymfpci_pm),
}, },
#endif
}; };
module_pci_driver(ymfpci_driver); module_pci_driver(ymfpci_driver);
...@@ -345,12 +345,10 @@ struct snd_ymfpci { ...@@ -345,12 +345,10 @@ struct snd_ymfpci {
const struct firmware *dsp_microcode; const struct firmware *dsp_microcode;
const struct firmware *controller_microcode; const struct firmware *controller_microcode;
#ifdef CONFIG_PM_SLEEP
u32 *saved_regs; u32 *saved_regs;
u32 saved_ydsxgr_mode; u32 saved_ydsxgr_mode;
u16 saved_dsxg_legacy; u16 saved_dsxg_legacy;
u16 saved_dsxg_elegacy; u16 saved_dsxg_elegacy;
#endif
}; };
int snd_ymfpci_create(struct snd_card *card, int snd_ymfpci_create(struct snd_card *card,
......
...@@ -2220,7 +2220,6 @@ static void snd_ymfpci_free(struct snd_card *card) ...@@ -2220,7 +2220,6 @@ static void snd_ymfpci_free(struct snd_card *card)
release_firmware(chip->controller_microcode); release_firmware(chip->controller_microcode);
} }
#ifdef CONFIG_PM_SLEEP
static const int saved_regs_index[] = { static const int saved_regs_index[] = {
/* spdif */ /* spdif */
YDSXGR_SPDIFOUTCTRL, YDSXGR_SPDIFOUTCTRL,
...@@ -2304,8 +2303,7 @@ static int snd_ymfpci_resume(struct device *dev) ...@@ -2304,8 +2303,7 @@ static int snd_ymfpci_resume(struct device *dev)
return 0; return 0;
} }
SIMPLE_DEV_PM_OPS(snd_ymfpci_pm, snd_ymfpci_suspend, snd_ymfpci_resume); DEFINE_SIMPLE_DEV_PM_OPS(snd_ymfpci_pm, snd_ymfpci_suspend, snd_ymfpci_resume);
#endif /* CONFIG_PM_SLEEP */
int snd_ymfpci_create(struct snd_card *card, int snd_ymfpci_create(struct snd_card *card,
struct pci_dev *pci, struct pci_dev *pci,
...@@ -2374,12 +2372,10 @@ int snd_ymfpci_create(struct snd_card *card, ...@@ -2374,12 +2372,10 @@ int snd_ymfpci_create(struct snd_card *card,
if (err < 0) if (err < 0)
return err; return err;
#ifdef CONFIG_PM_SLEEP
chip->saved_regs = devm_kmalloc_array(&pci->dev, YDSXGR_NUM_SAVED_REGS, chip->saved_regs = devm_kmalloc_array(&pci->dev, YDSXGR_NUM_SAVED_REGS,
sizeof(u32), GFP_KERNEL); sizeof(u32), GFP_KERNEL);
if (!chip->saved_regs) if (!chip->saved_regs)
return -ENOMEM; return -ENOMEM;
#endif
snd_ymfpci_proc_init(card, chip); snd_ymfpci_proc_init(card, chip);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment