Cleaned up a lot of #ifdef in functions using suggestions from Arjan.
Signed-off-by: Dave Airlie <airlied@linux.ie>