Fixed some formatting issues caught by checkpatch.pl;
remove redundant constant;