[jejb: fix up patch problems and checkpatch.pl issues]
Signed-off-by: NNick Cheng <nick.cheng@areca.com.tw>
Signed-off-by: NJames Bottomley <James.Bottomley@suse.de>