Small code refactoring to ease the real fix in patch #2.
Signed-off-by: NArvid Brodin <arvid.brodin@enea.com>
Tested-by: NCatalin Marinas <catalin.marinas@arm.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>