Commit fd1786bf authored by Takashi Iwai's avatar Takashi Iwai

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

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

Just a cleanup, no functional changes.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20240207155140.18238-8-tiwai@suse.deSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent b462d0b9
...@@ -65,6 +65,9 @@ int snd_ak4531_mixer(struct snd_card *card, struct snd_ak4531 *_ak4531, ...@@ -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 */
...@@ -1968,7 +1968,6 @@ static void snd_ensoniq_chip_init(struct ensoniq *ensoniq) ...@@ -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) ...@@ -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 = { ...@@ -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,
}, },
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment