Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1f447b3 authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by Bjorn Helgaas
Browse files

NVMe: Use pci_(request|release)_mem_regions 



Now that we do have pci_request_mem_regions() and pci_release_mem_regions()
at hand, use it in the NVMe driver.

Suggested-by: default avatarChristoph Hellwig <hch@infradead.org>
Signed-off-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
CC: Keith Busch <keith.busch@intel.com>
CC: Jens Axboe <axboe@fb.com>
parent be9d2e89

drivers/nvme/host/pci.c

+3 −7
Original line number Diff line number Diff line
@@ -1681,7 +1681,7 @@ static void nvme_dev_unmap(struct nvme_dev *dev) 
{

	if (dev->bar)

		iounmap(dev->bar);

	pci_release_regions(to_pci_dev(dev->dev));

	pci_release_mem_regions(to_pci_dev(dev->dev));

}



static void nvme_pci_disable(struct nvme_dev *dev)
@@ -1909,13 +1909,9 @@ static const struct nvme_ctrl_ops nvme_pci_ctrl_ops = { 


static int nvme_dev_map(struct nvme_dev *dev)

{

	int bars;

	struct pci_dev *pdev = to_pci_dev(dev->dev);



	bars = pci_select_bars(pdev, IORESOURCE_MEM);

	if (!bars)

		return -ENODEV;

	if (pci_request_selected_regions(pdev, bars, "nvme"))

	if (pci_request_mem_regions(pdev, "nvme"))

		return -ENODEV;



	dev->bar = ioremap(pci_resource_start(pdev, 0), 8192);
@@ -1924,7 +1920,7 @@ static int nvme_dev_map(struct nvme_dev *dev) 


       return 0;

  release:

       pci_release_regions(pdev);

       pci_release_mem_regions(pdev);

       return -ENODEV;

}