Clean the code a little by moving all the flags into the right
function.  Additionally, rename the function, since "common" is now
irrelevant.
Signed-off-by: NLuciano Coelho <luciano.coelho@intel.com>
Signed-off-by: NEmmanuel Grumbach <emmanuel.grumbach@intel.com>