1 files changed, 1 insertions, 11 deletions

diff --git a/arch/blackfin/mach-common/pm.c b/arch/blackfin/mach-common/pm.c
index 09c1fb410748..3c648a077e75 100644
--- a/arch/blackfin/mach-common/pm.c
+++ b/arch/blackfin/mach-common/pm.c
@@ -23,9 +23,6 @@
 
 void bfin_pm_suspend_standby_enter(void)
 {
-        unsigned long flags;
-
-        local_irq_save_hw(flags);
         bfin_pm_standby_setup();
 
 #ifdef CONFIG_PM_BFIN_SLEEP_DEEPER
@@ -55,8 +52,6 @@ void bfin_pm_suspend_standby_enter(void)
 #else
         bfin_write_SIC_IWR(IWR_DISABLE_ALL);
 #endif
-
-        local_irq_restore_hw(flags);
 }
 
 int bf53x_suspend_l1_mem(unsigned char *memptr)
@@ -127,7 +122,6 @@ static void flushinv_all_dcache(void)
 
 int bfin_pm_suspend_mem_enter(void)
 {
-        unsigned long flags;
         int wakeup, ret;
 
         unsigned char *memptr = kmalloc(L1_CODE_LENGTH + L1_DATA_A_LENGTH
@@ -149,12 +143,9 @@ int bfin_pm_suspend_mem_enter(void)
         wakeup |= GPWE;
 #endif
 
-        local_irq_save_hw(flags);
-
         ret = blackfin_dma_suspend();
 
         if (ret) {
-                local_irq_restore_hw(flags);
                 kfree(memptr);
                 return ret;
         }
@@ -178,7 +169,6 @@ int bfin_pm_suspend_mem_enter(void)
         bfin_gpio_pm_hibernate_restore();
         blackfin_dma_resume();
 
-        local_irq_restore_hw(flags);
         kfree(memptr);
 
         return 0;
@@ -233,7 +223,7 @@ static int bfin_pm_enter(suspend_state_t state)
         return 0;
 }
 
-struct platform_suspend_ops bfin_pm_ops = {
+static const struct platform_suspend_ops bfin_pm_ops = {
         .enter = bfin_pm_enter,
         .valid  = bfin_pm_valid,
 };