summaryrefslogtreecommitdiffstats
path: root/drivers/lightnvm
diff options
context:
space:
mode:
authorMatias Bjørling <m@bjorling.me>2016-07-07 03:54:13 -0400
committerJens Axboe <axboe@fb.com>2016-07-07 10:51:52 -0400
commit12624af26e59095a1b5216670028390177aa5820 (patch)
tree8f7ddefe9c273c172c2e4768eb49dbc621530325 /drivers/lightnvm
parent5114e2773a6817cd14fb959c2a523eed2679eb02 (diff)
lightnvm: fix checkpatch terse errors
A couple of small checkpatch fixups to stop it from complaining. ./drivers/lightnvm/core.c:360: WARNING: line over 80 characters ./drivers/lightnvm/core.c:360: ERROR: trailing statements should be on next line ./drivers/lightnvm/core.c:503: WARNING: Block comments use a trailing */ on a separate line Signed-off-by: Matias Bjørling <m@bjorling.me> Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'drivers/lightnvm')
-rw-r--r--drivers/lightnvm/core.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/lightnvm/core.c b/drivers/lightnvm/core.c
index 8beb9c04d898..0da196f6891b 100644
--- a/drivers/lightnvm/core.c
+++ b/drivers/lightnvm/core.c
@@ -373,7 +373,9 @@ int __nvm_submit_ppa(struct nvm_dev *dev, struct nvm_rq *rqd, int opcode,
373 /* Prevent hang_check timer from firing at us during very long I/O */ 373 /* Prevent hang_check timer from firing at us during very long I/O */
374 hang_check = sysctl_hung_task_timeout_secs; 374 hang_check = sysctl_hung_task_timeout_secs;
375 if (hang_check) 375 if (hang_check)
376 while (!wait_for_completion_io_timeout(&wait, hang_check * (HZ/2))); 376 while (!wait_for_completion_io_timeout(&wait,
377 hang_check * (HZ/2)))
378 ;
377 else 379 else
378 wait_for_completion_io(&wait); 380 wait_for_completion_io(&wait);
379 381
@@ -516,7 +518,8 @@ static int nvm_init_mlc_tbl(struct nvm_dev *dev, struct nvm_id_group *grp)
516 /* The lower page table encoding consists of a list of bytes, where each 518 /* The lower page table encoding consists of a list of bytes, where each
517 * has a lower and an upper half. The first half byte maintains the 519 * has a lower and an upper half. The first half byte maintains the
518 * increment value and every value after is an offset added to the 520 * increment value and every value after is an offset added to the
519 * previous incrementation value */ 521 * previous incrementation value
522 */
520 dev->lptbl[0] = mlc->pairs[0] & 0xF; 523 dev->lptbl[0] = mlc->pairs[0] & 0xF;
521 for (i = 1; i < dev->lps_per_blk; i++) { 524 for (i = 1; i < dev->lps_per_blk; i++) {
522 p = mlc->pairs[i >> 1]; 525 p = mlc->pairs[i >> 1];