PM / Hibernate: Remove arch_prepare_suspend()
All architectures supporting hibernation define arch_prepare_suspend() as an empty function, so remove it. Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
This commit is contained in:
parent
4e2d9491a7
commit
354258011e
|
@ -1,20 +0,0 @@
|
||||||
/* suspend.h: suspension stuff
|
|
||||||
*
|
|
||||||
* Copyright (C) 2004 Red Hat, Inc. All Rights Reserved.
|
|
||||||
* Written by David Howells (dhowells@redhat.com)
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU General Public License
|
|
||||||
* as published by the Free Software Foundation; either version
|
|
||||||
* 2 of the License, or (at your option) any later version.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef _ASM_SUSPEND_H
|
|
||||||
#define _ASM_SUSPEND_H
|
|
||||||
|
|
||||||
static inline int arch_prepare_suspend(void)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* _ASM_SUSPEND_H */
|
|
|
@ -1,8 +1,6 @@
|
||||||
#ifndef __ASM_SUSPEND_H
|
#ifndef __ASM_SUSPEND_H
|
||||||
#define __ASM_SUSPEND_H
|
#define __ASM_SUSPEND_H
|
||||||
|
|
||||||
static inline int arch_prepare_suspend(void) { return 0; }
|
|
||||||
|
|
||||||
/* References to section boundaries */
|
/* References to section boundaries */
|
||||||
extern const void __nosave_begin, __nosave_end;
|
extern const void __nosave_begin, __nosave_end;
|
||||||
|
|
||||||
|
|
|
@ -1,6 +0,0 @@
|
||||||
#ifndef __ASM_POWERPC_SUSPEND_H
|
|
||||||
#define __ASM_POWERPC_SUSPEND_H
|
|
||||||
|
|
||||||
static inline int arch_prepare_suspend(void) { return 0; }
|
|
||||||
|
|
||||||
#endif /* __ASM_POWERPC_SUSPEND_H */
|
|
|
@ -10,7 +10,6 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <linux/sched.h>
|
#include <linux/sched.h>
|
||||||
#include <asm/suspend.h>
|
|
||||||
#include <asm/system.h>
|
#include <asm/system.h>
|
||||||
#include <asm/current.h>
|
#include <asm/current.h>
|
||||||
#include <asm/mmu_context.h>
|
#include <asm/mmu_context.h>
|
||||||
|
|
|
@ -1,10 +0,0 @@
|
||||||
#ifndef __ASM_S390_SUSPEND_H
|
|
||||||
#define __ASM_S390_SUSPEND_H
|
|
||||||
|
|
||||||
static inline int arch_prepare_suspend(void)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
|
@ -3,7 +3,6 @@
|
||||||
|
|
||||||
#ifndef __ASSEMBLY__
|
#ifndef __ASSEMBLY__
|
||||||
#include <linux/notifier.h>
|
#include <linux/notifier.h>
|
||||||
static inline int arch_prepare_suspend(void) { return 0; }
|
|
||||||
|
|
||||||
#include <asm/ptrace.h>
|
#include <asm/ptrace.h>
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,6 @@
|
||||||
#define __UNICORE_SUSPEND_H__
|
#define __UNICORE_SUSPEND_H__
|
||||||
|
|
||||||
#ifndef __ASSEMBLY__
|
#ifndef __ASSEMBLY__
|
||||||
static inline int arch_prepare_suspend(void) { return 0; }
|
|
||||||
|
|
||||||
#include <asm/ptrace.h>
|
#include <asm/ptrace.h>
|
||||||
|
|
||||||
|
|
|
@ -9,8 +9,6 @@
|
||||||
#include <asm/desc.h>
|
#include <asm/desc.h>
|
||||||
#include <asm/i387.h>
|
#include <asm/i387.h>
|
||||||
|
|
||||||
static inline int arch_prepare_suspend(void) { return 0; }
|
|
||||||
|
|
||||||
/* image of the saved processor state */
|
/* image of the saved processor state */
|
||||||
struct saved_context {
|
struct saved_context {
|
||||||
u16 es, fs, gs, ss;
|
u16 es, fs, gs, ss;
|
||||||
|
|
|
@ -9,11 +9,6 @@
|
||||||
#include <asm/desc.h>
|
#include <asm/desc.h>
|
||||||
#include <asm/i387.h>
|
#include <asm/i387.h>
|
||||||
|
|
||||||
static inline int arch_prepare_suspend(void)
|
|
||||||
{
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Image of the saved processor state, used by the low level ACPI suspend to
|
* Image of the saved processor state, used by the low level ACPI suspend to
|
||||||
* RAM code and by the low level hibernation code.
|
* RAM code and by the low level hibernation code.
|
||||||
|
|
|
@ -25,7 +25,6 @@
|
||||||
#include <linux/gfp.h>
|
#include <linux/gfp.h>
|
||||||
#include <linux/syscore_ops.h>
|
#include <linux/syscore_ops.h>
|
||||||
#include <scsi/scsi_scan.h>
|
#include <scsi/scsi_scan.h>
|
||||||
#include <asm/suspend.h>
|
|
||||||
|
|
||||||
#include "power.h"
|
#include "power.h"
|
||||||
|
|
||||||
|
@ -244,10 +243,6 @@ static int create_image(int platform_mode)
|
||||||
{
|
{
|
||||||
int error;
|
int error;
|
||||||
|
|
||||||
error = arch_prepare_suspend();
|
|
||||||
if (error)
|
|
||||||
return error;
|
|
||||||
|
|
||||||
error = dpm_suspend_noirq(PMSG_FREEZE);
|
error = dpm_suspend_noirq(PMSG_FREEZE);
|
||||||
if (error) {
|
if (error) {
|
||||||
printk(KERN_ERR "PM: Some devices failed to power down, "
|
printk(KERN_ERR "PM: Some devices failed to power down, "
|
||||||
|
|
Loading…
Reference in New Issue