ARM: OMAP: Remove old PM_SUSPEND_DISK
authorTony Lindgren <tony@atomide.com>
Thu, 10 May 2007 22:50:16 +0000 (15:50 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 10 May 2007 22:50:16 +0000 (15:50 -0700)
Remove old PM_SUSPEND_DISK. Also some minor cosmetic
clean-up.

Signed-off-by: Tony Lindgren <tony@atomide.com>
arch/arm/mach-omap1/pm.c

index 6f4ea4bda5e0708ece8eadacea6550f90862171c..8caee68aa090a300943aabfac34fc98588c992d8 100644 (file)
@@ -1,4 +1,3 @@
-//kernel/linux-omap-fsample/arch/arm/mach-omap1/pm.c#3 - integrate change 4545 (text)
 /*
  * linux/arch/arm/mach-omap1/pm.c
  *
@@ -377,7 +376,7 @@ void omap_pm_suspend(void)
         * Jump to assembly code. The processor will stay there
         * until wake up.
         */
-        omap_sram_suspend(arg0, arg1);
+       omap_sram_suspend(arg0, arg1);
 
        /*
         * If we are here, processor is woken up!
@@ -631,10 +630,6 @@ static int omap_pm_prepare(suspend_state_t state)
        case PM_SUSPEND_STANDBY:
        case PM_SUSPEND_MEM:
                break;
-
-       case PM_SUSPEND_DISK:
-               return -ENOTSUPP;
-
        default:
                return -EINVAL;
        }
@@ -657,10 +652,6 @@ static int omap_pm_enter(suspend_state_t state)
        case PM_SUSPEND_MEM:
                omap_pm_suspend();
                break;
-
-       case PM_SUSPEND_DISK:
-               return -ENOTSUPP;
-
        default:
                return -EINVAL;
        }