correcting checkpatch warnings and errors