diff options
| author | K. Y. Srinivasan | 2011-06-07 00:49:40 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2011-06-07 22:45:49 +0200 |
| commit | 0246604ce0367b0c414cc77a05362308ef4ede54 (patch) | |
| tree | c0094b2742deb4b16bac43a23ad8a8805970ca40 /drivers/staging/hv | |
| parent | Staging: hv: vmbus: Make vmbus an acpi bus driver (diff) | |
| download | kernel-qcow2-linux-0246604ce0367b0c414cc77a05362308ef4ede54.tar.gz kernel-qcow2-linux-0246604ce0367b0c414cc77a05362308ef4ede54.tar.xz kernel-qcow2-linux-0246604ce0367b0c414cc77a05362308ef4ede54.zip | |
Staging: hv: vmbus: Get rid of vmbus_acpi_init() by inlining the code
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>
Diffstat (limited to 'drivers/staging/hv')
| -rw-r--r-- | drivers/staging/hv/vmbus_drv.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c index 176a8cda1f42..d799f42c819e 100644 --- a/drivers/staging/hv/vmbus_drv.c +++ b/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; |