[Coding conventions] a few fixes

Signed-off-by: Regis Merlino <regis.merlino@intel.com>