ACPI: PM: s2idle: Staticise LPS0 callback functions

The LPS0 callback functions in x86/s2idle.c can be made static, so do
that and remove their declarations from sleep.h.

While at it, add the _lps0 suffix to their names to indicate that
they are LPS0-specific.

No functional impact.

Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Reviewed-by: Mario Limonciello (AMD) <superm1@kernel.org>
Link: https://patch.msgid.link/2254836.irdbgypaU6@rafael.j.wysocki

diff --git a/drivers/acpi/sleep.h b/drivers/acpi/sleep.h
index d960a238be4e51de7f7fdb34906e1835360ccc22..9c3cb109c5d27e87961d133aba8fa0c4cba565c9 100644 (file)
--- a/drivers/acpi/sleep.h
+++ b/drivers/acpi/sleep.h
@@ -17,10 +17,7 @@ static inline acpi_status acpi_set_waking_vector(u32 wakeup_address)
 
 extern int acpi_s2idle_begin(void);
 extern int acpi_s2idle_prepare(void);
-extern int acpi_s2idle_prepare_late(void);
-extern void acpi_s2idle_check(void);
 extern bool acpi_s2idle_wake(void);
-extern void acpi_s2idle_restore_early(void);
 extern void acpi_s2idle_restore(void);
 extern void acpi_s2idle_end(void);
 

diff --git a/drivers/acpi/x86/s2idle.c b/drivers/acpi/x86/s2idle.c
index ea645853fc20045e08b5f040045dd837a1cf03c1..5ce556b1cfbc65db5a17c5200e9bfa2038154684 100644 (file)
--- a/drivers/acpi/x86/s2idle.c
+++ b/drivers/acpi/x86/s2idle.c
@@ -515,7 +515,7 @@ static struct acpi_scan_handler lps0_handler = {
        .attach = lps0_device_attach,
 };
 
-int acpi_s2idle_prepare_late(void)
+static int acpi_s2idle_prepare_late_lps0(void)
 {
        struct acpi_s2idle_dev_ops *handler;
 
@@ -561,7 +561,7 @@ int acpi_s2idle_prepare_late(void)
        return 0;
 }
 
-void acpi_s2idle_check(void)
+static void acpi_s2idle_check_lps0(void)
 {
        struct acpi_s2idle_dev_ops *handler;
 
@@ -574,7 +574,7 @@ void acpi_s2idle_check(void)
        }
 }
 
-void acpi_s2idle_restore_early(void)
+static void acpi_s2idle_restore_early_lps0(void)
 {
        struct acpi_s2idle_dev_ops *handler;
 
@@ -614,10 +614,10 @@ void acpi_s2idle_restore_early(void)
 static const struct platform_s2idle_ops acpi_s2idle_ops_lps0 = {
        .begin = acpi_s2idle_begin,
        .prepare = acpi_s2idle_prepare,
-       .prepare_late = acpi_s2idle_prepare_late,
-       .check = acpi_s2idle_check,
+       .prepare_late = acpi_s2idle_prepare_late_lps0,
+       .check = acpi_s2idle_check_lps0,
        .wake = acpi_s2idle_wake,
-       .restore_early = acpi_s2idle_restore_early,
+       .restore_early = acpi_s2idle_restore_early_lps0,
        .restore = acpi_s2idle_restore,
        .end = acpi_s2idle_end,
 };