lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ACPI: re-name acpi_pm_ops to acpi_suspend_ops

Browse Source 
... as they are platform_suspend_ops after all.

cosmetic re-name only, no functional change.

Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Len Brown
2008-04-23 18:02:52 -04:00
parent e7ae1e7ef9
commit 2c6e33c366
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/acpi/sleep/main.c
View File

@@ -51,7 +51,7 @@ static int acpi_sleep_prepare(u32 acpi_state)
} }
#ifdef CONFIG_SUSPEND #ifdef CONFIG_SUSPEND
static struct platform_suspend_ops acpi_pm_ops; static struct platform_suspend_ops acpi_suspend_ops;
extern void do_suspend_lowlevel(void); extern void do_suspend_lowlevel(void);
@@ -65,11 +65,11 @@ static u32 acpi_suspend_states[] = {
static int init_8259A_after_S1; static int init_8259A_after_S1;
/** /**
* acpi_pm_begin - Set the target system sleep state to the state * acpi_suspend_begin - Set the target system sleep state to the state
* associated with given @pm_state, if supported. * associated with given @pm_state, if supported.
*/ */
static int acpi_pm_begin(suspend_state_t pm_state) static int acpi_suspend_begin(suspend_state_t pm_state)
{ {
u32 acpi_state = acpi_suspend_states[pm_state]; u32 acpi_state = acpi_suspend_states[pm_state];
int error = 0; int error = 0;
@@ -85,13 +85,13 @@ static int acpi_pm_begin(suspend_state_t pm_state)
} }
/** /**
* acpi_pm_prepare - Do preliminary suspend work. * acpi_suspend_prepare - Do preliminary suspend work.
* *
* If necessary, set the firmware waking vector and do arch-specific * If necessary, set the firmware waking vector and do arch-specific
* nastiness to get the wakeup code to the waking vector. * nastiness to get the wakeup code to the waking vector.
*/ */
static int acpi_pm_prepare(void) static int acpi_suspend_prepare(void)
{ {
int error = acpi_sleep_prepare(acpi_target_sleep_state); int error = acpi_sleep_prepare(acpi_target_sleep_state);
@@ -104,7 +104,7 @@ static int acpi_pm_prepare(void)
} }
/** /**
* acpi_pm_enter - Actually enter a sleep state. * acpi_suspend_enter - Actually enter a sleep state.
* @pm_state: ignored * @pm_state: ignored
* *
* Flush caches and go to sleep. For STR we have to call arch-specific * Flush caches and go to sleep. For STR we have to call arch-specific
@@ -112,7 +112,7 @@ static int acpi_pm_prepare(void)
* It's unfortunate, but it works. Please fix if you're feeling frisky. * It's unfortunate, but it works. Please fix if you're feeling frisky.
*/ */
static int acpi_pm_enter(suspend_state_t pm_state) static int acpi_suspend_enter(suspend_state_t pm_state)
{ {
acpi_status status = AE_OK; acpi_status status = AE_OK;
unsigned long flags = 0; unsigned long flags = 0;
@@ -169,13 +169,13 @@ static int acpi_pm_enter(suspend_state_t pm_state)
} }
/** /**
* acpi_pm_finish - Instruct the platform to leave a sleep state. * acpi_suspend_finish - Instruct the platform to leave a sleep state.
* *
* This is called after we wake back up (or if entering the sleep state * This is called after we wake back up (or if entering the sleep state
* failed). * failed).
*/ */
static void acpi_pm_finish(void) static void acpi_suspend_finish(void)
{ {
u32 acpi_state = acpi_target_sleep_state; u32 acpi_state = acpi_target_sleep_state;
@@ -196,19 +196,19 @@ static void acpi_pm_finish(void)
} }
/** /**
* acpi_pm_end - Finish up suspend sequence. * acpi_suspend_end - Finish up suspend sequence.
*/ */
static void acpi_pm_end(void) static void acpi_suspend_end(void)
{ {
/* /*
* This is necessary in case acpi_pm_finish() is not called during a * This is necessary in case acpi_suspend_finish() is not called during a
* failing transition to a sleep state. * failing transition to a sleep state.
*/ */
acpi_target_sleep_state = ACPI_STATE_S0; acpi_target_sleep_state = ACPI_STATE_S0;
} }
static int acpi_pm_state_valid(suspend_state_t pm_state) static int acpi_suspend_state_valid(suspend_state_t pm_state)
{ {
u32 acpi_state; u32 acpi_state;
@@ -224,13 +224,13 @@ static int acpi_pm_state_valid(suspend_state_t pm_state)
} }
} }
static struct platform_suspend_ops acpi_pm_ops = { static struct platform_suspend_ops acpi_suspend_ops = {
.valid = acpi_pm_state_valid, .valid = acpi_suspend_state_valid,
.begin = acpi_pm_begin, .begin = acpi_suspend_begin,
.prepare = acpi_pm_prepare, .prepare = acpi_suspend_prepare,
.enter = acpi_pm_enter, .enter = acpi_suspend_enter,
.finish = acpi_pm_finish, .finish = acpi_suspend_finish,
.end = acpi_pm_end, .end = acpi_suspend_end,
}; };
/* /*
@@ -492,7 +492,7 @@ int __init acpi_sleep_init(void)
} }
} }
suspend_set_ops(&acpi_pm_ops); suspend_set_ops(&acpi_suspend_ops);
#endif #endif
#ifdef CONFIG_HIBERNATION #ifdef CONFIG_HIBERNATION