ALSA: aaci: Replace with DEFINE_SIMPLE_DEV_PM_OPS()

[linux-2.6-microblaze.git] / sound / arm / aaci.c

diff --git a/sound/arm/aaci.c b/sound/arm/aaci.c
index 0817ad2..f648965 100644 (file)
--- a/sound/arm/aaci.c
+++ b/sound/arm/aaci.c
@@ -737,7 +737,6 @@ static const struct snd_pcm_ops aaci_capture_ops = {
 /*
  * Power Management.
  */
-#ifdef CONFIG_PM
 static int aaci_do_suspend(struct snd_card *card)
 {
        struct aaci *aaci = card->private_data;
@@ -763,12 +762,7 @@ static int aaci_resume(struct device *dev)
        return card ? aaci_do_resume(card) : 0;
 }
 
-static SIMPLE_DEV_PM_OPS(aaci_dev_pm_ops, aaci_suspend, aaci_resume);
-#define AACI_DEV_PM_OPS (&aaci_dev_pm_ops)
-#else
-#define AACI_DEV_PM_OPS NULL
-#endif
-
+static DEFINE_SIMPLE_DEV_PM_OPS(aaci_dev_pm_ops, aaci_suspend, aaci_resume);
 
 static const struct ac97_pcm ac97_defs[] = {
        [0] = { /* Front PCM */
@@ -1081,7 +1075,7 @@ MODULE_DEVICE_TABLE(amba, aaci_ids);
 static struct amba_driver aaci_driver = {
        .drv            = {
                .name   = DRIVER_NAME,
-               .pm     = AACI_DEV_PM_OPS,
+               .pm     = &aaci_dev_pm_ops,
        },
        .probe          = aaci_probe,
        .remove         = aaci_remove,