ideapad_laptop: introduce #ifdef CONFIG_PM_SLEEP for PM specific code
authorZhang Rui <rui.zhang@intel.com>
Wed, 25 Sep 2013 12:39:46 +0000 (20:39 +0800)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 25 Sep 2013 17:40:12 +0000 (19:40 +0200)
ideapad_acpi_resume() and ideapad_pm is meaningful
only if CONFIG_PM_SLEEP is set.
Thus introduce #ifdef for this piece of code.

Signed-off-by: Zhang Rui <rui.zhang@intel.com>
CC: Matthew Garrett <matthew.garrett@nebula.com>
CC: Ike Panhc <ike.pan@canonical.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
drivers/platform/x86/ideapad-laptop.c

index 89c4519d48ac80d2a54f42ceabf7a48b792e871c..5021c55210e8557aadc7f0833e30c9bfb43d570d 100644 (file)
@@ -901,6 +901,7 @@ static void ideapad_acpi_notify(struct acpi_device *adevice, u32 event)
        }
 }
 
+#ifdef CONFIG_PM_SLEEP
 static int ideapad_acpi_resume(struct device *device)
 {
        ideapad_sync_rfk_state(ideapad_priv);
@@ -909,6 +910,7 @@ static int ideapad_acpi_resume(struct device *device)
 }
 
 static SIMPLE_DEV_PM_OPS(ideapad_pm, NULL, ideapad_acpi_resume);
+#endif
 
 static struct acpi_driver ideapad_acpi_driver = {
        .name = "ideapad_acpi",
@@ -917,7 +919,9 @@ static struct acpi_driver ideapad_acpi_driver = {
        .ops.add = ideapad_acpi_add,
        .ops.remove = ideapad_acpi_remove,
        .ops.notify = ideapad_acpi_notify,
+#ifdef CONFIG_PM_SLEEP
        .drv.pm = &ideapad_pm,
+#endif
        .owner = THIS_MODULE,
 };
 module_acpi_driver(ideapad_acpi_driver);