Staging: hv: vmbus: Get rid of vmbus_acpi_init() by inlining the code
authorK. Y. Srinivasan <kys@microsoft.com>
Mon, 6 Jun 2011 22:49:40 +0000 (15:49 -0700)
committerGreg Kroah-Hartman <gregkh@suse.de>
Tue, 7 Jun 2011 20:45:49 +0000 (13:45 -0700)
Staging: hv: vmbus: Get rid of  vmbus_acpi_init() 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>
drivers/staging/hv/vmbus_drv.c

index 176a8cda1f42a1837bcc9f511cfc158fcdcee8cc..d799f42c819e842ad1e7cc3f3d46dbfffa89aea8 100644 (file)
@@ -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;