1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c
index 4ab2275b446..bcaa6efa813 100644
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
@@ -393,7 +393,7 @@ static int acpi_hibernation_begin(void)
 {
         int error;
 
-        error = s4_no_nvs ? 0 : hibernate_nvs_alloc();
+        error = s4_no_nvs ? 0 : suspend_nvs_alloc();
         if (!error) {
                 acpi_target_sleep_state = ACPI_STATE_S4;
                 acpi_sleep_tts_switch(acpi_target_sleep_state);
@@ -407,7 +407,7 @@ static int acpi_hibernation_pre_snapshot(void)
         int error = acpi_pm_prepare();
 
         if (!error)
-                hibernate_nvs_save();
+                suspend_nvs_save();
 
         return error;
 }
@@ -432,7 +432,7 @@ static int acpi_hibernation_enter(void)
 
 static void acpi_hibernation_finish(void)
 {
-        hibernate_nvs_free();
+        suspend_nvs_free();
         acpi_pm_finish();
 }
 
@@ -452,7 +452,7 @@ static void acpi_hibernation_leave(void)
                 panic("ACPI S4 hardware signature mismatch");
         }
         /* Restore the NVS memory area */
-        hibernate_nvs_restore();
+        suspend_nvs_restore();
 }
 
 static int acpi_pm_pre_restore(void)
@@ -501,7 +501,7 @@ static int acpi_hibernation_begin_old(void)
 
         if (!error) {
                 if (!s4_no_nvs)
-                        error = hibernate_nvs_alloc();
+                        error = suspend_nvs_alloc();
                 if (!error)
                         acpi_target_sleep_state = ACPI_STATE_S4;
         }
@@ -513,7 +513,7 @@ static int acpi_hibernation_pre_snapshot_old(void)
         int error = acpi_pm_disable_gpes();
 
         if (!error)
-                hibernate_nvs_save();
+                suspend_nvs_save();
 
         return error;
 }