From: Rafael J. Wysocki Rename 'struct hibernation_ops' to 'struct platform_hibernation_ops' in analogy with 'struct platform_suspend_ops'. Signed-off-by: Rafael J. Wysocki Acked-by: Pavel Machek Cc: Len Brown Cc: Greg KH --- drivers/acpi/sleep/main.c | 2 +- include/linux/suspend.h | 8 ++++---- kernel/power/disk.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) Index: linux-2.6/drivers/acpi/sleep/main.c =================================================================== --- linux-2.6.orig/drivers/acpi/sleep/main.c 2007-07-30 22:17:47.000000000 +0200 +++ linux-2.6/drivers/acpi/sleep/main.c 2007-07-30 22:17:50.000000000 +0200 @@ -256,7 +256,7 @@ static void acpi_hibernation_restore_cle acpi_hw_enable_all_runtime_gpes(); } -static struct hibernation_ops acpi_hibernation_ops = { +static struct platform_hibernation_ops acpi_hibernation_ops = { .start = acpi_hibernation_start, .pre_snapshot = acpi_hibernation_prepare, .finish = acpi_hibernation_finish, Index: linux-2.6/include/linux/suspend.h =================================================================== --- linux-2.6.orig/include/linux/suspend.h 2007-07-30 22:17:47.000000000 +0200 +++ linux-2.6/include/linux/suspend.h 2007-07-30 22:17:50.000000000 +0200 @@ -127,7 +127,7 @@ extern void drain_local_pages(void); extern void mark_free_pages(struct zone *zone); /** - * struct hibernation_ops - hibernation platform support + * struct platform_hibernation_ops - hibernation platform support * * The methods in this structure allow a platform to override the default * mechanism of shutting down the machine during a hibernation transition. @@ -164,7 +164,7 @@ extern void mark_free_pages(struct zone * Called right after the nonboot CPUs have been enabled and before * thawing devices (runs with IRQs on). */ -struct hibernation_ops { +struct platform_hibernation_ops { int (*start)(void); int (*pre_snapshot)(void); void (*finish)(void); @@ -190,14 +190,14 @@ extern void swsusp_set_page_free(struct extern void swsusp_unset_page_free(struct page *); extern unsigned long get_safe_page(gfp_t gfp_mask); -extern void hibernation_set_ops(struct hibernation_ops *ops); +extern void hibernation_set_ops(struct platform_hibernation_ops *ops); extern int hibernate(void); #else /* CONFIG_HIBERNATION */ static inline int swsusp_page_is_forbidden(struct page *p) { return 0; } static inline void swsusp_set_page_free(struct page *p) {} static inline void swsusp_unset_page_free(struct page *p) {} -static inline void hibernation_set_ops(struct hibernation_ops *ops) {} +static inline void hibernation_set_ops(struct platform_hibernation_ops *ops) {} static inline int hibernate(void) { return -ENOSYS; } #endif /* CONFIG_HIBERNATION */ Index: linux-2.6/kernel/power/disk.c =================================================================== --- linux-2.6.orig/kernel/power/disk.c 2007-07-30 22:17:47.000000000 +0200 +++ linux-2.6/kernel/power/disk.c 2007-07-30 22:17:50.000000000 +0200 @@ -45,14 +45,14 @@ enum { static int hibernation_mode = HIBERNATION_SHUTDOWN; -static struct hibernation_ops *hibernation_ops; +static struct platform_hibernation_ops *hibernation_ops; /** * hibernation_set_ops - set the global hibernate operations * @ops: the hibernation operations to use in subsequent hibernation transitions */ -void hibernation_set_ops(struct hibernation_ops *ops) +void hibernation_set_ops(struct platform_hibernation_ops *ops) { if (ops && !(ops->start && ops->pre_snapshot && ops->finish && ops->prepare && ops->enter && ops->pre_restore