Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: pm: omap34xx: remove misleading comment and use of r9

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>

+2 -7
+2 -7
arch/arm/mach-omap2/sleep34xx.S
··· 381 381 382 382 restore: 383 383 /* 384 - * Check what was the reason for mpu reset and store the reason in r9: 385 - * 0 - No context lost 386 - * 1 - Only L1 and logic lost 387 - * 2 - Only L2 lost - In this case, we wont be here 388 - * 3 - Both L1 and L2 lost 384 + * Read the pwstctrl register to check the reason for mpu reset. 385 + * This tells us what was lost. 389 386 */ 390 387 ldr r1, pm_pwstctrl_mpu 391 388 ldr r2, [r1] 392 389 and r2, r2, #0x3 393 390 cmp r2, #0x0 @ Check if target power state was OFF or RET 394 - moveq r9, #0x3 @ MPU OFF => L1 and L2 lost 395 - movne r9, #0x1 @ Only L1 and L2 lost => avoid L2 invalidation 396 391 bne logic_l1_restore 397 392 398 393 ldr r0, l2dis_3630