This removes the PARTITION macro that David didn't like and also
removes a local variable that was dangling unused in some #ifdefs
by being a bit more clever.
Signed-off-by: NLinus Walleij <linus.walleij@stericsson.com>
Signed-off-by: NDavid Woodhouse <David.Woodhouse@intel.com>