Assembly macros are pointless if they're only used once.  Move
them inline.
Signed-off-by: NRussell King <rmk@arm.linux.org.uk>