Remove old PM_SUSPEND_DISK. Also some minor cosmetic
clean-up.
Signed-off-by: NTony Lindgren <tony@atomide.com>