Skip to content

Commit

Permalink
ALSA: ymfpci: Switch to DEFINE_SIMPLE_DEV_PM_OPS()
Browse files Browse the repository at this point in the history
Since commit 1a3c7bb ("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: Tasos Sahanidis <tasos@tasossah.com>
Link: https://lore.kernel.org/r/20230329041440.177363-2-tasos@tasossah.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Tasos Sahanidis authored and Takashi Iwai committed Mar 29, 2023
1 parent f09467e commit 081364d
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 10 deletions.
4 changes: 1 addition & 3 deletions sound/pci/ymfpci/ymfpci.c
Original file line number Diff line number Diff line change
Expand Up @@ -352,11 +352,9 @@ static struct pci_driver ymfpci_driver = {
.name = KBUILD_MODNAME,
.id_table = snd_ymfpci_ids,
.probe = snd_card_ymfpci_probe,
#ifdef CONFIG_PM_SLEEP
.driver = {
.pm = &snd_ymfpci_pm,
.pm = pm_sleep_ptr(&snd_ymfpci_pm),
},
#endif
};

module_pci_driver(ymfpci_driver);
2 changes: 0 additions & 2 deletions sound/pci/ymfpci/ymfpci.h
Original file line number Diff line number Diff line change
Expand Up @@ -345,12 +345,10 @@ struct snd_ymfpci {
const struct firmware *dsp_microcode;
const struct firmware *controller_microcode;

#ifdef CONFIG_PM_SLEEP
u32 *saved_regs;
u32 saved_ydsxgr_mode;
u16 saved_dsxg_legacy;
u16 saved_dsxg_elegacy;
#endif
};

int snd_ymfpci_create(struct snd_card *card,
Expand Down
6 changes: 1 addition & 5 deletions sound/pci/ymfpci/ymfpci_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -2220,7 +2220,6 @@ static void snd_ymfpci_free(struct snd_card *card)
release_firmware(chip->controller_microcode);
}

#ifdef CONFIG_PM_SLEEP
static const int saved_regs_index[] = {
/* spdif */
YDSXGR_SPDIFOUTCTRL,
Expand Down Expand Up @@ -2304,8 +2303,7 @@ static int snd_ymfpci_resume(struct device *dev)
return 0;
}

SIMPLE_DEV_PM_OPS(snd_ymfpci_pm, snd_ymfpci_suspend, snd_ymfpci_resume);
#endif /* CONFIG_PM_SLEEP */
DEFINE_SIMPLE_DEV_PM_OPS(snd_ymfpci_pm, snd_ymfpci_suspend, snd_ymfpci_resume);

int snd_ymfpci_create(struct snd_card *card,
struct pci_dev *pci,
Expand Down Expand Up @@ -2374,12 +2372,10 @@ int snd_ymfpci_create(struct snd_card *card,
if (err < 0)
return err;

#ifdef CONFIG_PM_SLEEP
chip->saved_regs = devm_kmalloc_array(&pci->dev, YDSXGR_NUM_SAVED_REGS,
sizeof(u32), GFP_KERNEL);
if (!chip->saved_regs)
return -ENOMEM;
#endif

snd_ymfpci_proc_init(card, chip);

Expand Down

0 comments on commit 081364d

Please sign in to comment.