drivers:hv: Use new vmbus_mmio_free() from client drivers.

This patch modifies all the callers of vmbus_mmio_allocate()
to call vmbus_mmio_free() instead of release_mem_region().

Signed-off-by: Jake Oshins <jakeo@microsoft.com>
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/pci/host/pci-hyperv.c b/drivers/pci/host/pci-hyperv.c
index ed651baa7c50033b6dd048e6f9bca3ba5d85105d..f2559b6497467057f93f65e4d83580f7d5388c44 100644 (file)
--- a/drivers/pci/host/pci-hyperv.c
+++ b/drivers/pci/host/pci-hyperv.c
@@ -1795,14 +1795,14 @@ static void hv_pci_free_bridge_windows(struct hv_pcibus_device *hbus)
 
        if (hbus->low_mmio_space && hbus->low_mmio_res) {
                hbus->low_mmio_res->flags |= IORESOURCE_BUSY;
-               release_mem_region(hbus->low_mmio_res->start,
-                                  resource_size(hbus->low_mmio_res));
+               vmbus_free_mmio(hbus->low_mmio_res->start,
+                               resource_size(hbus->low_mmio_res));
        }
 
        if (hbus->high_mmio_space && hbus->high_mmio_res) {
                hbus->high_mmio_res->flags |= IORESOURCE_BUSY;
-               release_mem_region(hbus->high_mmio_res->start,
-                                  resource_size(hbus->high_mmio_res));
+               vmbus_free_mmio(hbus->high_mmio_res->start,
+                               resource_size(hbus->high_mmio_res));
        }
 }
 
@@ -1880,8 +1880,8 @@ static int hv_pci_allocate_bridge_windows(struct hv_pcibus_device *hbus)
 
 release_low_mmio:
        if (hbus->low_mmio_res) {
-               release_mem_region(hbus->low_mmio_res->start,
-                                  resource_size(hbus->low_mmio_res));
+               vmbus_free_mmio(hbus->low_mmio_res->start,
+                               resource_size(hbus->low_mmio_res));
        }
 
        return ret;
@@ -1924,7 +1924,7 @@ static int hv_allocate_config_window(struct hv_pcibus_device *hbus)
 
 static void hv_free_config_window(struct hv_pcibus_device *hbus)
 {
-       release_mem_region(hbus->mem_config->start, PCI_CONFIG_MMIO_LENGTH);
+       vmbus_free_mmio(hbus->mem_config->start, PCI_CONFIG_MMIO_LENGTH);
 }
 
 /**

diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c
index e2451bdb4525d50fbd3de1aab743c51f7b05cef5..2fd49b2358f8b17e59ee97f77817d2d2bdb735c3 100644 (file)
--- a/drivers/video/fbdev/hyperv_fb.c
+++ b/drivers/video/fbdev/hyperv_fb.c
@@ -743,7 +743,7 @@ static int hvfb_getmem(struct hv_device *hdev, struct fb_info *info)
 err3:
        iounmap(fb_virt);
 err2:
-       release_mem_region(par->mem->start, screen_fb_size);
+       vmbus_free_mmio(par->mem->start, screen_fb_size);
        par->mem = NULL;
 err1:
        if (!gen2vm)
@@ -758,7 +758,7 @@ static void hvfb_putmem(struct fb_info *info)
        struct hvfb_par *par = info->par;
 
        iounmap(info->screen_base);
-       release_mem_region(par->mem->start, screen_fb_size);
+       vmbus_free_mmio(par->mem->start, screen_fb_size);
        par->mem = NULL;
 }