Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-12-29 17:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ALSA: als4000: Replace 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.

For building properly, add the dummy functions for
snd_sbmixer_suspend/resume() functions, too.

Just a cleanup, no functional changes.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20240207155140.18238-6-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2024-02-07 16:51:16 +01:00
parent 7aa8073066
commit 8cd4a3b221
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/sound/sb.h
View File

@ -290,6 +290,9 @@ int snd_sbmixer_new(struct snd_sb *chip);
#ifdef CONFIG_PM #ifdef CONFIG_PM
void snd_sbmixer_suspend(struct snd_sb *chip); void snd_sbmixer_suspend(struct snd_sb *chip);
void snd_sbmixer_resume(struct snd_sb *chip); void snd_sbmixer_resume(struct snd_sb *chip);
#else
static inline void snd_sbmixer_suspend(struct snd_sb *chip) {}
static inline void snd_sbmixer_resume(struct snd_sb *chip) {}
#endif #endif
/* sb8_init.c */ /* sb8_init.c */

9
sound/pci/als4000.c
View File

@ -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)); 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) static int snd_als4000_suspend(struct device *dev)
{ {
struct snd_card *card = dev_get_drvdata(dev); struct snd_card *card = dev_get_drvdata(dev);
@ -968,18 +967,14 @@ static int snd_als4000_resume(struct device *dev)
return 0; return 0;
} }
static SIMPLE_DEV_PM_OPS(snd_als4000_pm, snd_als4000_suspend, snd_als4000_resume); static DEFINE_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 struct pci_driver als4000_driver = { static struct pci_driver als4000_driver = {
.name = KBUILD_MODNAME, .name = KBUILD_MODNAME,
.id_table = snd_als4000_ids, .id_table = snd_als4000_ids,
.probe = snd_card_als4000_probe, .probe = snd_card_als4000_probe,
.driver = { .driver = {
.pm = SND_ALS4000_PM_OPS, .pm = &snd_als4000_pm,
}, },
}; };