nvme: lightnvm: clean up a data type
authorDan Carpenter <dan.carpenter@oracle.com>
Tue, 3 Nov 2015 22:37:31 +0000 (01:37 +0300)
committerJens Axboe <axboe@fb.com>
Tue, 3 Nov 2015 23:01:38 +0000 (16:01 -0700)
"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>
drivers/nvme/host/lightnvm.c

index 133c8396ec93389bb0cc19541442451edd92de7b..e0b7b95813bc98e1fc7f25fd422fad87690ec2e4 100644 (file)
@@ -282,7 +282,7 @@ static int nvme_nvm_get_l2p_tbl(struct request_queue *q, u64 slba, u32 nlb,
        struct nvme_dev *dev = ns->dev;
        struct nvme_nvm_command c = {};
        u32 len = queue_max_hw_sectors(q) << 9;
-       u64 nlb_pr_rq = len / sizeof(u64);
+       u32 nlb_pr_rq = len / sizeof(u64);
        u64 cmd_slba = slba;
        void *entries;
        int ret = 0;
@@ -294,7 +294,7 @@ static int nvme_nvm_get_l2p_tbl(struct request_queue *q, u64 slba, u32 nlb,
                return -ENOMEM;
 
        while (nlb) {
-               u32 cmd_nlb = min_t(u32, nlb_pr_rq, nlb);
+               u32 cmd_nlb = min(nlb_pr_rq, nlb);
 
                c.l2p.slba = cpu_to_le64(cmd_slba);
                c.l2p.nlb = cpu_to_le32(cmd_nlb);