Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 228447
b: refs/heads/master
c: 36e11ab
h: refs/heads/master
i:
  228445: 885e6b0
  228443: d770f73
  228439: ff1dc31
  228431: 22e1c00
  228415: 4f86d0e
v: v3
  • Loading branch information
Steven Miao authored and Mike Frysinger committed Jan 10, 2011
1 parent 0a90bcd commit db70a71
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 527a1a83cc1ba4fc3e0f708cff062b834fbbcab9
refs/heads/master: 36e11ab23e22243b9c608a08c8d68ca5686b6c9b
10 changes: 0 additions & 10 deletions trunk/arch/blackfin/mach-common/pm.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@

void bfin_pm_suspend_standby_enter(void)
{
unsigned long flags;

flags = hard_local_irq_save();
bfin_pm_standby_setup();

#ifdef CONFIG_PM_BFIN_SLEEP_DEEPER
Expand Down Expand Up @@ -55,8 +52,6 @@ void bfin_pm_suspend_standby_enter(void)
#else
bfin_write_SIC_IWR(IWR_DISABLE_ALL);
#endif

hard_local_irq_restore(flags);
}

int bf53x_suspend_l1_mem(unsigned char *memptr)
Expand Down Expand Up @@ -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
Expand All @@ -149,12 +143,9 @@ int bfin_pm_suspend_mem_enter(void)
wakeup |= GPWE;
#endif

flags = hard_local_irq_save();

ret = blackfin_dma_suspend();

if (ret) {
hard_local_irq_restore(flags);
kfree(memptr);
return ret;
}
Expand All @@ -178,7 +169,6 @@ int bfin_pm_suspend_mem_enter(void)
bfin_gpio_pm_hibernate_restore();
blackfin_dma_resume();

hard_local_irq_restore(flags);
kfree(memptr);

return 0;
Expand Down

0 comments on commit db70a71

Please sign in to comment.