git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
palmz72.c
diff --git
a/arch/arm/mach-pxa/palmz72.c
b/arch/arm/mach-pxa/palmz72.c
index
3b8a4f3
..
65f24f0
100644
(file)
--- a/
arch/arm/mach-pxa/palmz72.c
+++ b/
arch/arm/mach-pxa/palmz72.c
@@
-19,7
+19,7
@@
*/
#include <linux/platform_device.h>
*/
#include <linux/platform_device.h>
-#include <linux/sys
dev
.h>
+#include <linux/sys
core_ops
.h>
#include <linux/delay.h>
#include <linux/irq.h>
#include <linux/gpio_keys.h>
#include <linux/delay.h>
#include <linux/irq.h>
#include <linux/gpio_keys.h>
@@
-233,9
+233,9
@@
static struct palmz72_resume_info palmz72_resume_info = {
static unsigned long store_ptr;
static unsigned long store_ptr;
-/* sys
_device
for Palm Zire 72 PM */
+/* sys
core_ops
for Palm Zire 72 PM */
-static int palmz72_pm_suspend(
struct sys_device *dev, pm_message_t msg
)
+static int palmz72_pm_suspend(
void
)
{
/* setup the resume_info struct for the original bootloader */
palmz72_resume_info.resume_addr = (u32) cpu_resume;
{
/* setup the resume_info struct for the original bootloader */
palmz72_resume_info.resume_addr = (u32) cpu_resume;
@@
-249,31
+249,23
@@
static int palmz72_pm_suspend(struct sys_device *dev, pm_message_t msg)
return 0;
}
return 0;
}
-static
int palmz72_pm_resume(struct sys_device *dev
)
+static
void palmz72_pm_resume(void
)
{
*PALMZ72_SAVE_DWORD = store_ptr;
{
*PALMZ72_SAVE_DWORD = store_ptr;
- return 0;
}
}
-static struct sysdev_class palmz72_pm_sysclass = {
- .name = "palmz72_pm",
+static struct syscore_ops palmz72_pm_syscore_ops = {
.suspend = palmz72_pm_suspend,
.resume = palmz72_pm_resume,
};
.suspend = palmz72_pm_suspend,
.resume = palmz72_pm_resume,
};
-static struct sys_device palmz72_pm_device = {
- .cls = &palmz72_pm_sysclass,
-};
-
static int __init palmz72_pm_init(void)
{
static int __init palmz72_pm_init(void)
{
- int ret = -ENODEV;
if (machine_is_palmz72()) {
if (machine_is_palmz72()) {
- ret = sysdev_class_register(&palmz72_pm_sysclass);
- if (ret == 0)
- ret = sysdev_register(&palmz72_pm_device);
+ register_syscore_ops(&palmz72_pm_syscore_ops);
+ return 0;
}
}
- return
ret
;
+ return
-ENODEV
;
}
device_initcall(palmz72_pm_init);
}
device_initcall(palmz72_pm_init);