NVMe: Only release requested regions

The NVMe driver only requests the PCIe device's memory regions but releases
all possible regions (including eventual I/O regions). This leads to a stale
warning entry in dmesg about freeing non existent resources.

Signed-off-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c
index 78dca3193ca4ccc61df9784ff7699834c61e08b2..befac5b19490ee91e13dec00c471931005b871b7 100644 (file)
--- a/drivers/nvme/host/pci.c
+++ b/drivers/nvme/host/pci.c
@@ -1679,9 +1679,14 @@ static int nvme_pci_enable(struct nvme_dev *dev)
 
 static void nvme_dev_unmap(struct nvme_dev *dev)
 {
 
 static void nvme_dev_unmap(struct nvme_dev *dev)
 {

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

        if (dev->bar)
                iounmap(dev->bar);
        if (dev->bar)
                iounmap(dev->bar);

-       pci_release_regions(to_pci_dev(dev->dev));
+
+       bars = pci_select_bars(pdev, IORESOURCE_MEM);
+       pci_release_selected_regions(pdev, bars);

 }
 
 static void nvme_pci_disable(struct nvme_dev *dev)
 }
 
 static void nvme_pci_disable(struct nvme_dev *dev)


@@ -1924,7 +1929,7 @@ static int nvme_dev_map(struct nvme_dev *dev)
 
        return 0;
   release:
 
        return 0;
   release:

-       pci_release_regions(pdev);
+       pci_release_selected_regions(pdev, bars);

        return -ENODEV;
 }
 
        return -ENODEV;
 }