aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1/pm.c
diff options
context:
space:
mode:
authorTony Lindgren <tony@atomide.com>2007-05-10 18:50:16 -0400
committerTony Lindgren <tony@atomide.com>2007-05-10 18:50:16 -0400
commitd30c7369666ff1687f668ea5a65b99d1f7e06144 (patch)
treec3650161a9c81c48a92737d33d70029bc32b00d0 /arch/arm/mach-omap1/pm.c
parent0695de32579edefd137f7e9fa056e6d204011d70 (diff)
ARM: OMAP: Remove old PM_SUSPEND_DISK
Remove old PM_SUSPEND_DISK. Also some minor cosmetic clean-up. Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1/pm.c')
-rw-r--r--arch/arm/mach-omap1/pm.c11
1 files changed, 1 insertions, 10 deletions
diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index 6f4ea4bda5e0..8caee68aa090 100644
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -1,4 +1,3 @@
1//kernel/linux-omap-fsample/arch/arm/mach-omap1/pm.c#3 - integrate change 4545 (text)
2/* 1/*
3 * linux/arch/arm/mach-omap1/pm.c 2 * linux/arch/arm/mach-omap1/pm.c
4 * 3 *
@@ -377,7 +376,7 @@ void omap_pm_suspend(void)
377 * Jump to assembly code. The processor will stay there 376 * Jump to assembly code. The processor will stay there
378 * until wake up. 377 * until wake up.
379 */ 378 */
380 omap_sram_suspend(arg0, arg1); 379 omap_sram_suspend(arg0, arg1);
381 380
382 /* 381 /*
383 * If we are here, processor is woken up! 382 * If we are here, processor is woken up!
@@ -631,10 +630,6 @@ static int omap_pm_prepare(suspend_state_t state)
631 case PM_SUSPEND_STANDBY: 630 case PM_SUSPEND_STANDBY:
632 case PM_SUSPEND_MEM: 631 case PM_SUSPEND_MEM:
633 break; 632 break;
634
635 case PM_SUSPEND_DISK:
636 return -ENOTSUPP;
637
638 default: 633 default:
639 return -EINVAL; 634 return -EINVAL;
640 } 635 }
@@ -657,10 +652,6 @@ static int omap_pm_enter(suspend_state_t state)
657 case PM_SUSPEND_MEM: 652 case PM_SUSPEND_MEM:
658 omap_pm_suspend(); 653 omap_pm_suspend();
659 break; 654 break;
660
661 case PM_SUSPEND_DISK:
662 return -ENOTSUPP;
663
664 default: 655 default:
665 return -EINVAL; 656 return -EINVAL;
666 } 657 }