OpenSDV
/
linux-stable-rt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ACPI / PM: Drop acpi_restore_state_mem() 

The function acpi_restore_state_mem() has never been and most likely
never will be used, so remove it.

Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
This commit is contained in:
Rafael J. Wysocki 2011-02-08 23:41:35 +01:00
parent c19f9a84ec
commit c41b93fb85
5 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/ia64/include/asm/acpi.h
View File

@ -128,9 +128,9 @@ static inline const char *acpi_get_sysname (void)
int acpi_request_vector (u32 int_type); int acpi_request_vector (u32 int_type);
int acpi_gsi_to_irq (u32 gsi, unsigned int *irq); int acpi_gsi_to_irq (u32 gsi, unsigned int *irq);
/* routines for saving/restoring kernel state */ /* Routine for saving kernel state during suspend. */
extern int acpi_save_state_mem(void); extern int acpi_save_state_mem(void);
extern void acpi_restore_state_mem(void);
extern unsigned long acpi_wakeup_address; extern unsigned long acpi_wakeup_address;
/* /*

5
arch/ia64/kernel/acpi.c
View File

@ -1040,11 +1040,6 @@ EXPORT_SYMBOL(acpi_unregister_ioapic);
*/ */
int acpi_save_state_mem(void) { return 0; } int acpi_save_state_mem(void) { return 0; }
/*
* acpi_restore_state()
*/
void acpi_restore_state_mem(void) {}
/* /*
* do_suspend_lowlevel() * do_suspend_lowlevel()
*/ */

3
arch/x86/include/asm/acpi.h
View File

@ -112,9 +112,8 @@ static inline void acpi_disable_pci(void)
acpi_noirq_set(); acpi_noirq_set();
} }
/* routines for saving/restoring kernel state */ /* Routine for saving kernel state during suspend. */
extern int acpi_save_state_mem(void); extern int acpi_save_state_mem(void);
extern void acpi_restore_state_mem(void);
extern unsigned long acpi_wakeup_address; extern unsigned long acpi_wakeup_address;

8
arch/x86/kernel/acpi/sleep.c
View File

@ -110,14 +110,6 @@ int acpi_save_state_mem(void)
return 0; return 0;
} }
/*
* acpi_restore_state - undo effects of acpi_save_state_mem
*/
void acpi_restore_state_mem(void)
{
}
/** /**
* acpi_reserve_wakeup_memory - do _very_ early ACPI initialisation * acpi_reserve_wakeup_memory - do _very_ early ACPI initialisation
* *

4
drivers/acpi/sleep.c
View File

@ -293,10 +293,6 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
local_irq_restore(flags); local_irq_restore(flags);
printk(KERN_DEBUG "Back to C!\n"); printk(KERN_DEBUG "Back to C!\n");
/* restore processor state */
if (acpi_state == ACPI_STATE_S3)
acpi_restore_state_mem();
suspend_nvs_restore(); suspend_nvs_restore();
return ACPI_SUCCESS(status) ? 0 : -EFAULT; return ACPI_SUCCESS(status) ? 0 : -EFAULT;