Skip to content

Commit

Permalink
ARM: pm: omap34xx: remove misleading comment and use of r9
Browse files Browse the repository at this point in the history
The code alludes to r9 being used to indicate what was lost over the
suspend/resume transition.  However, although r9 is set, it is never
actually used.

Also, the comments before the code (which refer to the value of r9)
and the comments against the assignment of r9 contradict each other,
so just remove them to avoid confusion.

Reviewed-by: Kevin Hilman <khilman@ti.com>
Tested-by: Kevin Hilman <khilman@ti.com>
Acked-by: Jean Pihet <j-pihet@ti.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King committed Jun 24, 2011
1 parent 857c1b8 commit 2637ce3
Showing 1 changed file with 2 additions and 7 deletions.
9 changes: 2 additions & 7 deletions arch/arm/mach-omap2/sleep34xx.S
Original file line number Diff line number Diff line change
Expand Up @@ -381,18 +381,13 @@ restore_3630:

restore:
/*
* Check what was the reason for mpu reset and store the reason in r9:
* 0 - No context lost
* 1 - Only L1 and logic lost
* 2 - Only L2 lost - In this case, we wont be here
* 3 - Both L1 and L2 lost
* Read the pwstctrl register to check the reason for mpu reset.
* This tells us what was lost.
*/
ldr r1, pm_pwstctrl_mpu
ldr r2, [r1]
and r2, r2, #0x3
cmp r2, #0x0 @ Check if target power state was OFF or RET
moveq r9, #0x3 @ MPU OFF => L1 and L2 lost
movne r9, #0x1 @ Only L1 and L2 lost => avoid L2 invalidation
bne logic_l1_restore

ldr r0, l2dis_3630
Expand Down

0 comments on commit 2637ce3

Please sign in to comment.