diff options
Diffstat (limited to 'arch/blackfin/mach-common/pm.c')
-rw-r--r-- | arch/blackfin/mach-common/pm.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/blackfin/mach-common/pm.c b/arch/blackfin/mach-common/pm.c index 80884b136a0c..42fa87e8375c 100644 --- a/arch/blackfin/mach-common/pm.c +++ b/arch/blackfin/mach-common/pm.c | |||
@@ -23,9 +23,6 @@ | |||
23 | 23 | ||
24 | void bfin_pm_suspend_standby_enter(void) | 24 | void bfin_pm_suspend_standby_enter(void) |
25 | { | 25 | { |
26 | unsigned long flags; | ||
27 | |||
28 | flags = hard_local_irq_save(); | ||
29 | bfin_pm_standby_setup(); | 26 | bfin_pm_standby_setup(); |
30 | 27 | ||
31 | #ifdef CONFIG_PM_BFIN_SLEEP_DEEPER | 28 | #ifdef CONFIG_PM_BFIN_SLEEP_DEEPER |
@@ -55,8 +52,6 @@ void bfin_pm_suspend_standby_enter(void) | |||
55 | #else | 52 | #else |
56 | bfin_write_SIC_IWR(IWR_DISABLE_ALL); | 53 | bfin_write_SIC_IWR(IWR_DISABLE_ALL); |
57 | #endif | 54 | #endif |
58 | |||
59 | hard_local_irq_restore(flags); | ||
60 | } | 55 | } |
61 | 56 | ||
62 | int bf53x_suspend_l1_mem(unsigned char *memptr) | 57 | int bf53x_suspend_l1_mem(unsigned char *memptr) |
@@ -127,7 +122,6 @@ static void flushinv_all_dcache(void) | |||
127 | 122 | ||
128 | int bfin_pm_suspend_mem_enter(void) | 123 | int bfin_pm_suspend_mem_enter(void) |
129 | { | 124 | { |
130 | unsigned long flags; | ||
131 | int wakeup, ret; | 125 | int wakeup, ret; |
132 | 126 | ||
133 | unsigned char *memptr = kmalloc(L1_CODE_LENGTH + L1_DATA_A_LENGTH | 127 | unsigned char *memptr = kmalloc(L1_CODE_LENGTH + L1_DATA_A_LENGTH |
@@ -149,12 +143,9 @@ int bfin_pm_suspend_mem_enter(void) | |||
149 | wakeup |= GPWE; | 143 | wakeup |= GPWE; |
150 | #endif | 144 | #endif |
151 | 145 | ||
152 | flags = hard_local_irq_save(); | ||
153 | |||
154 | ret = blackfin_dma_suspend(); | 146 | ret = blackfin_dma_suspend(); |
155 | 147 | ||
156 | if (ret) { | 148 | if (ret) { |
157 | hard_local_irq_restore(flags); | ||
158 | kfree(memptr); | 149 | kfree(memptr); |
159 | return ret; | 150 | return ret; |
160 | } | 151 | } |
@@ -178,7 +169,6 @@ int bfin_pm_suspend_mem_enter(void) | |||
178 | bfin_gpio_pm_hibernate_restore(); | 169 | bfin_gpio_pm_hibernate_restore(); |
179 | blackfin_dma_resume(); | 170 | blackfin_dma_resume(); |
180 | 171 | ||
181 | hard_local_irq_restore(flags); | ||
182 | kfree(memptr); | 172 | kfree(memptr); |
183 | 173 | ||
184 | return 0; | 174 | return 0; |