final s2w cleanup for real

Signed-off-by: Bryan Smith <zarboz@gmail.com>

Conflicts:
	drivers/input/touchscreen/sweep2wake.c