From: K. Y. Srinivasan <kys@microsoft.com>
Date: Mon, 6 Jun 2011 22:49:41 +0000 (-0700)
Subject: Staging: hv: vmbus: Get rid of vmbus_acpi_exit() by inlining the code
X-Git-Tag: MMI-PSA29.97-13-9~18845^2~568^2~65
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2da9e1d6d4ae4cde1ad6d9e365417aabf466c665;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Staging: hv: vmbus: Get rid of vmbus_acpi_exit() by inlining the code

Get rid of vmbus_acpi_exit() by inlining the code.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c
index d799f42c819e..39cd277749b9 100644
--- a/drivers/staging/hv/vmbus_drv.c
+++ b/drivers/staging/hv/vmbus_drv.c
@@ -758,14 +758,6 @@ static struct acpi_driver vmbus_acpi_driver = {
 	},
 };
 
-static void vmbus_acpi_exit(void)
-{
-	acpi_bus_unregister_driver(&vmbus_acpi_driver);
-
-	return;
-}
-
-
 /*
  * We use a PCI table to determine if we should autoload this driver  This is
  * needed by distro tools to determine if the hyperv drivers should be
@@ -796,7 +788,7 @@ static int __init hv_acpi_init(void)
 	wait_for_completion(&probe_event);
 
 	if (irq <= 0) {
-		vmbus_acpi_exit();
+		acpi_bus_unregister_driver(&vmbus_acpi_driver);
 		return -ENODEV;
 	}