Coding Style changes to adhere to scripts/cstyle.pl