Skip to content

Commit bfc0990

Browse files
committed
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
1 parent a00f3de commit bfc0990

2 files changed

Lines changed: 6 additions & 9 deletions

File tree

drivers/acpi/sleep.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,7 @@ static inline acpi_status acpi_set_waking_vector(u32 wakeup_address)
1717

1818
extern int acpi_s2idle_begin(void);
1919
extern int acpi_s2idle_prepare(void);
20-
extern int acpi_s2idle_prepare_late(void);
21-
extern void acpi_s2idle_check(void);
2220
extern bool acpi_s2idle_wake(void);
23-
extern void acpi_s2idle_restore_early(void);
2421
extern void acpi_s2idle_restore(void);
2522
extern void acpi_s2idle_end(void);
2623

drivers/acpi/x86/s2idle.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -515,7 +515,7 @@ static struct acpi_scan_handler lps0_handler = {
515515
.attach = lps0_device_attach,
516516
};
517517

518-
int acpi_s2idle_prepare_late(void)
518+
static int acpi_s2idle_prepare_late_lps0(void)
519519
{
520520
struct acpi_s2idle_dev_ops *handler;
521521

@@ -561,7 +561,7 @@ int acpi_s2idle_prepare_late(void)
561561
return 0;
562562
}
563563

564-
void acpi_s2idle_check(void)
564+
static void acpi_s2idle_check_lps0(void)
565565
{
566566
struct acpi_s2idle_dev_ops *handler;
567567

@@ -574,7 +574,7 @@ void acpi_s2idle_check(void)
574574
}
575575
}
576576

577-
void acpi_s2idle_restore_early(void)
577+
static void acpi_s2idle_restore_early_lps0(void)
578578
{
579579
struct acpi_s2idle_dev_ops *handler;
580580

@@ -614,10 +614,10 @@ void acpi_s2idle_restore_early(void)
614614
static const struct platform_s2idle_ops acpi_s2idle_ops_lps0 = {
615615
.begin = acpi_s2idle_begin,
616616
.prepare = acpi_s2idle_prepare,
617-
.prepare_late = acpi_s2idle_prepare_late,
618-
.check = acpi_s2idle_check,
617+
.prepare_late = acpi_s2idle_prepare_late_lps0,
618+
.check = acpi_s2idle_check_lps0,
619619
.wake = acpi_s2idle_wake,
620-
.restore_early = acpi_s2idle_restore_early,
620+
.restore_early = acpi_s2idle_restore_early_lps0,
621621
.restore = acpi_s2idle_restore,
622622
.end = acpi_s2idle_end,
623623
};

0 commit comments

Comments
 (0)