Cleanup only, no functional changes. Just making code easier to
follow.
Signed-off-by: NFelipe Balbi <felipe.balbi@linux.intel.com>