summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSagi Grimberg <sagi@grimberg.me>2017-04-30 23:27:17 +0200
committerSagi Grimberg <sagi@grimberg.me>2017-07-02 14:03:23 +0200
commit01ad0990467eaa17ae17db7376a4f02739f558c0 (patch)
tree367b577cefbbd87fa3e4f67c7ed11b989cc0efd2
parentnvme: move ctrl cap to struct nvme_ctrl (diff)
downloadlinux-01ad0990467eaa17ae17db7376a4f02739f558c0.tar.xz
linux-01ad0990467eaa17ae17db7376a4f02739f558c0.zip
nvme-pci: rename to nvme_pci_configure_admin_queue
we are going to need the name for the core routine... Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de> Reviewed-by: Max Gurtovoy <maxg@mellanox.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
-rw-r--r--drivers/nvme/host/pci.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index fe3907a082ba..eb729ff70e7d 100644
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1383,7 +1383,7 @@ static int nvme_remap_bar(struct nvme_dev *dev, unsigned long size)
return 0;
}
-static int nvme_configure_admin_queue(struct nvme_dev *dev)
+static int nvme_pci_configure_admin_queue(struct nvme_dev *dev)
{
int result;
u32 aqa;
@@ -2096,7 +2096,7 @@ static void nvme_reset_work(struct work_struct *work)
if (result)
goto out;
- result = nvme_configure_admin_queue(dev);
+ result = nvme_pci_configure_admin_queue(dev);
if (result)
goto out;