Misc cleanup. No functional changes.
Signed-off-by: NFelipe Balbi <felipe.balbi@linux.intel.com>