Updated code that passed Checkpatch.pl