The patch below is purely a cleanup but it's a prerequisite for the
next bug fix patch.
Signed-off-by: David Mosberger-Tang <davidm@hpl.hp.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>