mirror of
https://github.com/torvalds/linux
synced 2024-10-15 07:47:34 +00:00
ALSA: fm801: Simplify with DEFINE_SIMPLE_DEV_PM_OPS()
Use the new DEFINE_SIMPLE_DEV_PM_OPS() instead of SIMPLE_DEV_PM_OPS() for code-simplification. We need no longer CONFIG_PM_SLEEP ifdefs. This ends up with the allocation of a few additional bytes for the register dumps even if it's not really used, but the code simplification should justify the cost. Signed-off-by: Takashi Iwai <tiwai@suse.de> Link: https://lore.kernel.org/r/20240207155140.18238-24-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
5947c394ac
commit
e6c2f5ec41
|
@ -222,9 +222,7 @@ struct fm801 {
|
||||||
struct snd_tea575x tea;
|
struct snd_tea575x tea;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_PM_SLEEP
|
|
||||||
u16 saved_regs[0x20];
|
u16 saved_regs[0x20];
|
||||||
#endif
|
|
||||||
};
|
};
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -1339,7 +1337,6 @@ static int snd_card_fm801_probe(struct pci_dev *pci,
|
||||||
return snd_card_free_on_error(&pci->dev, __snd_card_fm801_probe(pci, pci_id));
|
return snd_card_free_on_error(&pci->dev, __snd_card_fm801_probe(pci, pci_id));
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_PM_SLEEP
|
|
||||||
static const unsigned char saved_regs[] = {
|
static const unsigned char saved_regs[] = {
|
||||||
FM801_PCM_VOL, FM801_I2S_VOL, FM801_FM_VOL, FM801_REC_SRC,
|
FM801_PCM_VOL, FM801_I2S_VOL, FM801_FM_VOL, FM801_REC_SRC,
|
||||||
FM801_PLY_CTRL, FM801_PLY_COUNT, FM801_PLY_BUF1, FM801_PLY_BUF2,
|
FM801_PLY_CTRL, FM801_PLY_COUNT, FM801_PLY_BUF1, FM801_PLY_BUF2,
|
||||||
|
@ -1396,18 +1393,14 @@ static int snd_fm801_resume(struct device *dev)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static SIMPLE_DEV_PM_OPS(snd_fm801_pm, snd_fm801_suspend, snd_fm801_resume);
|
static DEFINE_SIMPLE_DEV_PM_OPS(snd_fm801_pm, snd_fm801_suspend, snd_fm801_resume);
|
||||||
#define SND_FM801_PM_OPS &snd_fm801_pm
|
|
||||||
#else
|
|
||||||
#define SND_FM801_PM_OPS NULL
|
|
||||||
#endif /* CONFIG_PM_SLEEP */
|
|
||||||
|
|
||||||
static struct pci_driver fm801_driver = {
|
static struct pci_driver fm801_driver = {
|
||||||
.name = KBUILD_MODNAME,
|
.name = KBUILD_MODNAME,
|
||||||
.id_table = snd_fm801_ids,
|
.id_table = snd_fm801_ids,
|
||||||
.probe = snd_card_fm801_probe,
|
.probe = snd_card_fm801_probe,
|
||||||
.driver = {
|
.driver = {
|
||||||
.pm = SND_FM801_PM_OPS,
|
.pm = &snd_fm801_pm,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue