Pull thermal into release branch

[linux-drm-fsl-dcu.git] / arch / sh / boards / hp6xx / pm.c

diff --git a/arch/sh/boards/hp6xx/pm.c b/arch/sh/boards/hp6xx/pm.c
index d1947732fb3e5013e0b8d00f6f8ce42bf31e090a..8143d1b948e7e2b4d33820abba8d5984866c8eaf 100644 (file)
--- a/arch/sh/boards/hp6xx/pm.c
+++ b/arch/sh/boards/hp6xx/pm.c
@@ -27,9 +27,6 @@ static int hp6x0_pm_enter(suspend_state_t state)
        u16 hd64461_stbcr;
 #endif
 
-       if (state != PM_SUSPEND_MEM)
-               return -EINVAL;
-
 #ifdef CONFIG_HD64461_ENABLER
        outb(0, HD64461_PCC1CSCIER);
 
@@ -70,12 +67,9 @@ static int hp6x0_pm_enter(suspend_state_t state)
        return 0;
 }
 
-/*
- * Set to PM_DISK_FIRMWARE so we can quickly veto suspend-to-disk.
- */
 static struct pm_ops hp6x0_pm_ops = {
-       .pm_disk_mode   = PM_DISK_FIRMWARE,
        .enter          = hp6x0_pm_enter,
+       .valid          = pm_valid_only_mem,
 };
 
 static int __init hp6x0_pm_init(void)