Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c41b93fb authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

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: default avatarRafael J. Wysocki <rjw@sisk.pl>
parent c19f9a84

arch/ia64/include/asm/acpi.h

+2 −2
Original line number Diff line number Diff line
@@ -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;



/*

arch/ia64/kernel/acpi.c

+0 −5
Original line number Diff line number Diff line
@@ -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()

 */

arch/x86/include/asm/acpi.h

+1 −2
Original line number Diff line number Diff line
@@ -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;

arch/x86/kernel/acpi/sleep.c

+0 −8
Original line number Diff line number Diff line
@@ -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

 *

drivers/acpi/sleep.c

+0 −4
Original line number Diff line number Diff line
@@ -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;