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 'for-linus' of git://oss.sgi.com/xfs/xfs
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
cm-x2xx.c
diff --git
a/arch/arm/mach-pxa/cm-x2xx.c
b/arch/arm/mach-pxa/cm-x2xx.c
index
8225e2e
..
a109967
100644
(file)
--- a/
arch/arm/mach-pxa/cm-x2xx.c
+++ b/
arch/arm/mach-pxa/cm-x2xx.c
@@
-10,7
+10,7
@@
*/
#include <linux/platform_device.h>
*/
#include <linux/platform_device.h>
-#include <linux/sys
dev
.h>
+#include <linux/sys
core_ops
.h>
#include <linux/irq.h>
#include <linux/gpio.h>
#include <linux/irq.h>
#include <linux/gpio.h>
@@
-388,7
+388,7
@@
static inline void cmx2xx_init_display(void) {}
#ifdef CONFIG_PM
static unsigned long sleep_save_msc[10];
#ifdef CONFIG_PM
static unsigned long sleep_save_msc[10];
-static int cmx2xx_suspend(
struct sys_device *dev, pm_message_t state
)
+static int cmx2xx_suspend(
void
)
{
cmx2xx_pci_suspend();
{
cmx2xx_pci_suspend();
@@
-412,7
+412,7
@@
static int cmx2xx_suspend(struct sys_device *dev, pm_message_t state)
return 0;
}
return 0;
}
-static
int cmx2xx_resume(struct sys_device *dev
)
+static
void cmx2xx_resume(void
)
{
cmx2xx_pci_resume();
{
cmx2xx_pci_resume();
@@
-420,27
+420,18
@@
static int cmx2xx_resume(struct sys_device *dev)
__raw_writel(sleep_save_msc[0], MSC0);
__raw_writel(sleep_save_msc[1], MSC1);
__raw_writel(sleep_save_msc[2], MSC2);
__raw_writel(sleep_save_msc[0], MSC0);
__raw_writel(sleep_save_msc[1], MSC1);
__raw_writel(sleep_save_msc[2], MSC2);
-
- return 0;
}
}
-static struct sysdev_class cmx2xx_pm_sysclass = {
- .name = "pm",
+static struct syscore_ops cmx2xx_pm_syscore_ops = {
.resume = cmx2xx_resume,
.suspend = cmx2xx_suspend,
};
.resume = cmx2xx_resume,
.suspend = cmx2xx_suspend,
};
-static struct sys_device cmx2xx_pm_device = {
- .cls = &cmx2xx_pm_sysclass,
-};
-
static int __init cmx2xx_pm_init(void)
{
static int __init cmx2xx_pm_init(void)
{
- int error;
- error = sysdev_class_register(&cmx2xx_pm_sysclass);
- if (error == 0)
- error = sysdev_register(&cmx2xx_pm_device);
- return error;
+ register_syscore_ops(&cmx2xx_pm_syscore_ops);
+
+ return 0;
}
#else
static int __init cmx2xx_pm_init(void) { return 0; }
}
#else
static int __init cmx2xx_pm_init(void) { return 0; }