From 5d795704aace50fcf01dacd71cd8bff34f9b06d4 Mon Sep 17 00:00:00 2001
From: "K. Y. Srinivasan" <kys@microsoft.com>
Date: Mon, 6 Jun 2011 15:49:40 -0700
Subject: [PATCH] --- yaml --- r: 259448 b: refs/heads/master c:
 0246604ce0367b0c414cc77a05362308ef4ede54 h: refs/heads/master v: v3

---
 [refs]                               |  2 +-
 trunk/drivers/staging/hv/vmbus_drv.c | 15 ++-------------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/[refs] b/[refs]
index a47c9febb10b..01f9f85df5c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 607c1a11d0ca017d12134444c3cca4da1f6594f8
+refs/heads/master: 0246604ce0367b0c414cc77a05362308ef4ede54
diff --git a/trunk/drivers/staging/hv/vmbus_drv.c b/trunk/drivers/staging/hv/vmbus_drv.c
index 176a8cda1f42..d799f42c819e 100644
--- a/trunk/drivers/staging/hv/vmbus_drv.c
+++ b/trunk/drivers/staging/hv/vmbus_drv.c
@@ -758,18 +758,6 @@ static struct acpi_driver vmbus_acpi_driver = {
 	},
 };
 
-static int vmbus_acpi_init(void)
-{
-	int result;
-
-
-	result = acpi_bus_register_driver(&vmbus_acpi_driver);
-	if (result < 0)
-		return result;
-
-	return 0;
-}
-
 static void vmbus_acpi_exit(void)
 {
 	acpi_bus_unregister_driver(&vmbus_acpi_driver);
@@ -800,7 +788,8 @@ static int __init hv_acpi_init(void)
 	 * Get irq resources first.
 	 */
 
-	ret = vmbus_acpi_init();
+	ret = acpi_bus_register_driver(&vmbus_acpi_driver);
+
 	if (ret)
 		return ret;