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

Commit 696ca5e8 authored by Jake Oshins's avatar Jake Oshins Committed by Greg Kroah-Hartman
Browse files

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: default avatarJake Oshins <jakeo@microsoft.com>
Signed-off-by: default avatarK. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 97fb77dc

drivers/pci/host/pci-hyperv.c

+7 −7
Original line number Diff line number Diff line
@@ -1795,13 +1795,13 @@ 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,

		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,

		vmbus_free_mmio(hbus->high_mmio_res->start,

				resource_size(hbus->high_mmio_res));

	}

}
@@ -1880,7 +1880,7 @@ 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,

		vmbus_free_mmio(hbus->low_mmio_res->start,

				resource_size(hbus->low_mmio_res));

	}
@@ -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);

}



/**

drivers/video/fbdev/hyperv_fb.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

}