Skip to content

Commit

Permalink
ACPI / PM: Drop acpi_restore_state_mem()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Rafael J. Wysocki committed Feb 24, 2011
1 parent c19f9a8 commit c41b93f
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 21 deletions.
4 changes: 2 additions & 2 deletions arch/ia64/include/asm/acpi.h
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,9 @@ static inline const char *acpi_get_sysname (void)
int acpi_request_vector (u32 int_type);
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 void acpi_restore_state_mem(void);

extern unsigned long acpi_wakeup_address;

/*
Expand Down
5 changes: 0 additions & 5 deletions arch/ia64/kernel/acpi.c
Original file line number Diff line number Diff line change
Expand Up @@ -1040,11 +1040,6 @@ EXPORT_SYMBOL(acpi_unregister_ioapic);
*/
int acpi_save_state_mem(void) { return 0; }

/*
* acpi_restore_state()
*/
void acpi_restore_state_mem(void) {}

/*
* do_suspend_lowlevel()
*/
Expand Down
3 changes: 1 addition & 2 deletions arch/x86/include/asm/acpi.h
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,8 @@ static inline void acpi_disable_pci(void)
acpi_noirq_set();
}

/* routines for saving/restoring kernel state */
/* Routine for saving kernel state during suspend. */
extern int acpi_save_state_mem(void);
extern void acpi_restore_state_mem(void);

extern unsigned long acpi_wakeup_address;

Expand Down
8 changes: 0 additions & 8 deletions arch/x86/kernel/acpi/sleep.c
Original file line number Diff line number Diff line change
Expand Up @@ -110,14 +110,6 @@ int acpi_save_state_mem(void)
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
*
Expand Down
4 changes: 0 additions & 4 deletions drivers/acpi/sleep.c
Original file line number Diff line number Diff line change
Expand Up @@ -293,10 +293,6 @@ static int acpi_suspend_enter(suspend_state_t pm_state)
local_irq_restore(flags);
printk(KERN_DEBUG "Back to C!\n");

/* restore processor state */
if (acpi_state == ACPI_STATE_S3)
acpi_restore_state_mem();

suspend_nvs_restore();

return ACPI_SUCCESS(status) ? 0 : -EFAULT;
Expand Down

0 comments on commit c41b93f

Please sign in to comment.