ALSA: ali5451: Simplify 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.

This ends up with the allocation of a few additional bytes for the
image 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-17-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/ali5451/ali5451.c b/sound/pci/ali5451/ali5451.c
index 9d48638a3ab403e6497bda2968f8220b24aa007e..31e51e2df6557d6d946bca4c1b872f6e5a8905f8 100644 (file)
--- a/sound/pci/ali5451/ali5451.c
+++ b/sound/pci/ali5451/ali5451.c
@@ -243,9 +243,7 @@ struct snd_ali {
        spinlock_t      reg_lock;
        spinlock_t      voice_alloc;
 
-#ifdef CONFIG_PM_SLEEP
        struct snd_ali_image image;
-#endif
 };
 
 static const struct pci_device_id snd_ali_ids[] = {
@@ -1824,7 +1822,6 @@ static int snd_ali_mixer(struct snd_ali *codec)
        return 0;
 }
 
-#ifdef CONFIG_PM_SLEEP
 static int ali_suspend(struct device *dev)
 {
        struct snd_card *card = dev_get_drvdata(dev);
@@ -1900,11 +1897,7 @@ static int ali_resume(struct device *dev)
        return 0;
 }
 
-static SIMPLE_DEV_PM_OPS(ali_pm, ali_suspend, ali_resume);
-#define ALI_PM_OPS     &ali_pm
-#else
-#define ALI_PM_OPS     NULL
-#endif /* CONFIG_PM_SLEEP */
+static DEFINE_SIMPLE_DEV_PM_OPS(ali_pm, ali_suspend, ali_resume);
 
 static void snd_ali_free(struct snd_card *card)
 {
@@ -2166,7 +2159,7 @@ static struct pci_driver ali5451_driver = {
        .id_table = snd_ali_ids,
        .probe = snd_ali_probe,
        .driver = {
-               .pm = ALI_PM_OPS,
+               .pm = &ali_pm,
        },
 };