nvme-pci: use ctrl sgl check helper

Use the helper to check NVMe controller's SGL support.

Signed-off-by: Chaitanya Kulkarni <chaitanya.kulkarni@wdc.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 138e7e7..12ffd58 100644 (file)
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -536,7 +536,7 @@ static inline bool nvme_pci_use_sgls(struct nvme_dev *dev, struct request *req)
 
        avg_seg_size = DIV_ROUND_UP(blk_rq_payload_bytes(req), nseg);
 
-       if (!(dev->ctrl.sgls & ((1 << 0) | (1 << 1))))
+       if (!nvme_ctrl_sgl_supported(&dev->ctrl))
                return false;
        if (!iod->nvmeq->qid)
                return false;
@@ -853,7 +853,7 @@ static blk_status_t nvme_map_data(struct nvme_dev *dev, struct request *req,
                                                             &cmnd->rw, &bv);
 
                        if (iod->nvmeq->qid && sgl_threshold &&
-                           dev->ctrl.sgls & ((1 << 0) | (1 << 1)))
+                           nvme_ctrl_sgl_supported(&dev->ctrl))
                                return nvme_setup_sgl_simple(dev, req,
                                                             &cmnd->rw, &bv);
                }