Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-01 10:45:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ALSA: cs4281: Simplify with DEFINE_SIMPLE_DEV_PM_OPS()

Browse Source 
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-20-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2024-02-07 16:51:30 +01:00
parent 1c69bc3955
commit cbdcefbde8
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sound/pci/cs4281.c
View File

@ -470,10 +470,7 @@ struct cs4281 {
struct gameport *gameport; struct gameport *gameport;
#ifdef CONFIG_PM_SLEEP
u32 suspend_regs[SUSPEND_REGISTERS]; u32 suspend_regs[SUSPEND_REGISTERS];
#endif
}; };
static irqreturn_t snd_cs4281_interrupt(int irq, void *dev_id); static irqreturn_t snd_cs4281_interrupt(int irq, void *dev_id);
@ -1897,8 +1894,6 @@ static int snd_cs4281_probe(struct pci_dev *pci,
/* /*
* Power Management * Power Management
*/ */
#ifdef CONFIG_PM_SLEEP
static const int saved_regs[SUSPEND_REGISTERS] = { static const int saved_regs[SUSPEND_REGISTERS] = {
BA0_JSCTL, BA0_JSCTL,
BA0_GPIOR, BA0_GPIOR,
@ -1987,18 +1982,14 @@ static int cs4281_resume(struct device *dev)
return 0; return 0;
} }
static SIMPLE_DEV_PM_OPS(cs4281_pm, cs4281_suspend, cs4281_resume); static DEFINE_SIMPLE_DEV_PM_OPS(cs4281_pm, cs4281_suspend, cs4281_resume);
#define CS4281_PM_OPS &cs4281_pm
#else
#define CS4281_PM_OPS NULL
#endif /* CONFIG_PM_SLEEP */
static struct pci_driver cs4281_driver = { static struct pci_driver cs4281_driver = {
.name = KBUILD_MODNAME, .name = KBUILD_MODNAME,
.id_table = snd_cs4281_ids, .id_table = snd_cs4281_ids,
.probe = snd_cs4281_probe, .probe = snd_cs4281_probe,
.driver = { .driver = {
.pm = CS4281_PM_OPS, .pm = &cs4281_pm,
}, },
}; };