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: ens137x: 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_ak4531_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-8-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2024-02-07 16:51:18 +01:00
parent b462d0b9e3
commit fd1786bf71
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/ak4531_codec.h
View File

@ -65,6 +65,9 @@ int snd_ak4531_mixer(struct snd_card *card, struct snd_ak4531 *_ak4531,
#ifdef CONFIG_PM #ifdef CONFIG_PM
void snd_ak4531_suspend(struct snd_ak4531 *ak4531); void snd_ak4531_suspend(struct snd_ak4531 *ak4531);
void snd_ak4531_resume(struct snd_ak4531 *ak4531); void snd_ak4531_resume(struct snd_ak4531 *ak4531);
#else
static inline void snd_ak4531_suspend(struct snd_ak4531 *ak4531) {}
static inline void snd_ak4531_resume(struct snd_ak4531 *ak4531) {}
#endif #endif
#endif /* __SOUND_AK4531_CODEC_H */ #endif /* __SOUND_AK4531_CODEC_H */

9
sound/pci/ens1370.c
View File

@ -1968,7 +1968,6 @@ static void snd_ensoniq_chip_init(struct ensoniq *ensoniq)
outl(ensoniq->cssr, ES_REG(ensoniq, STATUS)); outl(ensoniq->cssr, ES_REG(ensoniq, STATUS));
} }
#ifdef CONFIG_PM_SLEEP
static int snd_ensoniq_suspend(struct device *dev) static int snd_ensoniq_suspend(struct device *dev)
{ {
struct snd_card *card = dev_get_drvdata(dev); struct snd_card *card = dev_get_drvdata(dev);
@ -2007,11 +2006,7 @@ static int snd_ensoniq_resume(struct device *dev)
return 0; return 0;
} }
static SIMPLE_DEV_PM_OPS(snd_ensoniq_pm, snd_ensoniq_suspend, snd_ensoniq_resume); static DEFINE_SIMPLE_DEV_PM_OPS(snd_ensoniq_pm, snd_ensoniq_suspend, snd_ensoniq_resume);
#define SND_ENSONIQ_PM_OPS &snd_ensoniq_pm
#else
#define SND_ENSONIQ_PM_OPS NULL
#endif /* CONFIG_PM_SLEEP */
static int snd_ensoniq_create(struct snd_card *card, static int snd_ensoniq_create(struct snd_card *card,
struct pci_dev *pci) struct pci_dev *pci)
@ -2380,7 +2375,7 @@ static struct pci_driver ens137x_driver = {
.id_table = snd_audiopci_ids, .id_table = snd_audiopci_ids,
.probe = snd_audiopci_probe, .probe = snd_audiopci_probe,
.driver = { .driver = {
.pm = SND_ENSONIQ_PM_OPS, .pm = &snd_ensoniq_pm,
}, },
}; };