Commit 13c1b30c authored by Takashi Iwai's avatar Takashi Iwai

ALSA: intel8x0: 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.
Just a cleanup, no functional changes.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20240207155140.18238-9-tiwai@suse.deSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent fd1786bf
...@@ -2555,7 +2555,6 @@ static void snd_intel8x0_free(struct snd_card *card) ...@@ -2555,7 +2555,6 @@ static void snd_intel8x0_free(struct snd_card *card)
free_irq(chip->irq, chip); free_irq(chip->irq, chip);
} }
#ifdef CONFIG_PM_SLEEP
/* /*
* power management * power management
*/ */
...@@ -2628,11 +2627,7 @@ static int intel8x0_resume(struct device *dev) ...@@ -2628,11 +2627,7 @@ static int intel8x0_resume(struct device *dev)
return 0; return 0;
} }
static SIMPLE_DEV_PM_OPS(intel8x0_pm, intel8x0_suspend, intel8x0_resume); static DEFINE_SIMPLE_DEV_PM_OPS(intel8x0_pm, intel8x0_suspend, intel8x0_resume);
#define INTEL8X0_PM_OPS &intel8x0_pm
#else
#define INTEL8X0_PM_OPS NULL
#endif /* CONFIG_PM_SLEEP */
#define INTEL8X0_TESTBUF_SIZE 32768 /* enough large for one shot */ #define INTEL8X0_TESTBUF_SIZE 32768 /* enough large for one shot */
...@@ -3200,7 +3195,7 @@ static struct pci_driver intel8x0_driver = { ...@@ -3200,7 +3195,7 @@ static struct pci_driver intel8x0_driver = {
.id_table = snd_intel8x0_ids, .id_table = snd_intel8x0_ids,
.probe = snd_intel8x0_probe, .probe = snd_intel8x0_probe,
.driver = { .driver = {
.pm = INTEL8X0_PM_OPS, .pm = &intel8x0_pm,
}, },
}; };
......
...@@ -965,7 +965,6 @@ static void snd_intel8x0m_free(struct snd_card *card) ...@@ -965,7 +965,6 @@ static void snd_intel8x0m_free(struct snd_card *card)
free_irq(chip->irq, chip); free_irq(chip->irq, chip);
} }
#ifdef CONFIG_PM_SLEEP
/* /*
* power management * power management
*/ */
...@@ -1006,11 +1005,7 @@ static int intel8x0m_resume(struct device *dev) ...@@ -1006,11 +1005,7 @@ static int intel8x0m_resume(struct device *dev)
return 0; return 0;
} }
static SIMPLE_DEV_PM_OPS(intel8x0m_pm, intel8x0m_suspend, intel8x0m_resume); static DEFINE_SIMPLE_DEV_PM_OPS(intel8x0m_pm, intel8x0m_suspend, intel8x0m_resume);
#define INTEL8X0M_PM_OPS &intel8x0m_pm
#else
#define INTEL8X0M_PM_OPS NULL
#endif /* CONFIG_PM_SLEEP */
static void snd_intel8x0m_proc_read(struct snd_info_entry * entry, static void snd_intel8x0m_proc_read(struct snd_info_entry * entry,
struct snd_info_buffer *buffer) struct snd_info_buffer *buffer)
...@@ -1236,7 +1231,7 @@ static struct pci_driver intel8x0m_driver = { ...@@ -1236,7 +1231,7 @@ static struct pci_driver intel8x0m_driver = {
.id_table = snd_intel8x0m_ids, .id_table = snd_intel8x0m_ids,
.probe = snd_intel8x0m_probe, .probe = snd_intel8x0m_probe,
.driver = { .driver = {
.pm = INTEL8X0M_PM_OPS, .pm = &intel8x0m_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