diff options
author | Dan Carpenter <dan.carpenter@oracle.com> | 2015-11-03 17:37:31 -0500 |
---|---|---|
committer | Jens Axboe <axboe@fb.com> | 2015-11-03 18:01:38 -0500 |
commit | 5f436e5ef170e5d3301bf5777a3c7c048295db1c (patch) | |
tree | acfff8c6db9e87715efe8c0b76c23c843f073b23 | |
parent | b7ceb7d50048d0dd4830f106f0fb7f5424031598 (diff) |
nvme: lightnvm: clean up a data type
"nlb_pr_rq" can't be more than u32 because "len" is a u32. Later we
truncate it to u32 anyway when we calculate min_t().
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
-rw-r--r-- | drivers/nvme/host/lightnvm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nvme/host/lightnvm.c b/drivers/nvme/host/lightnvm.c index 133c8396ec93..e0b7b95813bc 100644 --- a/drivers/nvme/host/lightnvm.c +++ b/drivers/nvme/host/lightnvm.c | |||
@@ -282,7 +282,7 @@ static int nvme_nvm_get_l2p_tbl(struct request_queue *q, u64 slba, u32 nlb, | |||
282 | struct nvme_dev *dev = ns->dev; | 282 | struct nvme_dev *dev = ns->dev; |
283 | struct nvme_nvm_command c = {}; | 283 | struct nvme_nvm_command c = {}; |
284 | u32 len = queue_max_hw_sectors(q) << 9; | 284 | u32 len = queue_max_hw_sectors(q) << 9; |
285 | u64 nlb_pr_rq = len / sizeof(u64); | 285 | u32 nlb_pr_rq = len / sizeof(u64); |
286 | u64 cmd_slba = slba; | 286 | u64 cmd_slba = slba; |
287 | void *entries; | 287 | void *entries; |
288 | int ret = 0; | 288 | int ret = 0; |
@@ -294,7 +294,7 @@ static int nvme_nvm_get_l2p_tbl(struct request_queue *q, u64 slba, u32 nlb, | |||
294 | return -ENOMEM; | 294 | return -ENOMEM; |
295 | 295 | ||
296 | while (nlb) { | 296 | while (nlb) { |
297 | u32 cmd_nlb = min_t(u32, nlb_pr_rq, nlb); | 297 | u32 cmd_nlb = min(nlb_pr_rq, nlb); |
298 | 298 | ||
299 | c.l2p.slba = cpu_to_le64(cmd_slba); | 299 | c.l2p.slba = cpu_to_le64(cmd_slba); |
300 | c.l2p.nlb = cpu_to_le32(cmd_nlb); | 300 | c.l2p.nlb = cpu_to_le32(cmd_nlb); |