While at it, fix a few checkpatch issues.
Signed-off-by: NEmmanuel Grumbach <emmanuel.grumbach@intel.com>