This last patch is a bit if a mess because it mainly consists of combining
some single use small functions into their callers and rearranging some other
code.

Some intermediate variables are introduced and some code is restructured to
improve its readablility (and hopefully maintainability).

Overall there are no semantic changes.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>