summaryrefslogtreecommitdiff
path: root/drivers/nvme/host/pci.c
diff options
context:
space:
mode:
authorSagi Grimberg <sagi@grimberg.me>2019-07-22 17:06:53 -0700
committerSagi Grimberg <sagi@grimberg.me>2019-08-29 12:55:00 -0700
commitc0f2f45be2976abe973c8cd544f38e2d928771b0 (patch)
tree040efcf8dc137e451ff40aba4550f7089eb545b5 /drivers/nvme/host/pci.c
parentaa22c8e6650d29a00196087caa2bbb32dc6117bc (diff)
downloadlwn-c0f2f45be2976abe973c8cd544f38e2d928771b0.tar.gz
lwn-c0f2f45be2976abe973c8cd544f38e2d928771b0.zip
nvme: move sqsize setting to the core
nvme_enable_ctrl reads the cap register right after, so no need to do that locally in the transport driver. Have sqsize setting in nvme_init_identify. Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
Diffstat (limited to 'drivers/nvme/host/pci.c')
-rw-r--r--drivers/nvme/host/pci.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 530104d20506..cc5787e5b451 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1695,7 +1695,7 @@ static int nvme_pci_configure_admin_queue(struct nvme_dev *dev)
lo_hi_writeq(nvmeq->sq_dma_addr, dev->bar + NVME_REG_ASQ);
lo_hi_writeq(nvmeq->cq_dma_addr, dev->bar + NVME_REG_ACQ);
- result = nvme_enable_ctrl(&dev->ctrl, dev->ctrl.cap);
+ result = nvme_enable_ctrl(&dev->ctrl);
if (result)
return result;