Remove commented out code, and unnecessary declarations.
Signed-off-by: NRussell King <rmk+kernel@arm.linux.org.uk>