Use swap() helper macro instead of open coded swap instructions. The
change also facilitates code cleanup and realignment for improved
readability.  Issue identified using swap.cocci Coccinelle semantic
patch script.
Signed-off-by: NDeepak R Varma <drv@mailo.com>
Signed-off-by: NAlex Deucher <alexander.deucher@amd.com>