diff options
| author | K. Y. Srinivasan <kys@microsoft.com> | 2011-03-10 14:06:31 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-14 12:29:58 -0700 |
| commit | f51b3593bbea8b403117212588bda87429545fa7 (patch) | |
| tree | 68d6034553b4fa9ecf2ac49f116bba356c3f3c05 /drivers/staging | |
| parent | 480ae58db525e57cc18611eec7ae24633d2e7efc (diff) | |
Staging: hv: Get rid of vmbus_dev_rm() function
Get rid of the vmbus_dev_rm() function by inlining
the necessary code.
Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Mike Sterling <mike.sterling@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/hv/vmbus_drv.c | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c index 8e8a408d687..11c69c576e3 100644 --- a/drivers/staging/hv/vmbus_drv.c +++ b/drivers/staging/hv/vmbus_drv.c @@ -172,18 +172,6 @@ static int vmbus_dev_add(struct hv_device *dev, void *info) return ret; } -/* - * vmbus_dev_rm - Callback when the root bus device is removed - */ -static int vmbus_dev_rm(struct hv_device *dev) -{ - int ret = 0; - - vmbus_release_unattached_channels(); - vmbus_disconnect(); - on_each_cpu(hv_synic_cleanup, NULL, 1); - return ret; -} /* * vmbus_cleanup - Perform any cleanup when the driver is removed @@ -568,8 +556,9 @@ static void vmbus_bus_exit(void) struct hv_device *dev_ctx = &vmbus_drv.device_ctx; - /* Remove the root device */ - vmbus_dev_rm(dev_ctx); + vmbus_release_unattached_channels(); + vmbus_disconnect(); + on_each_cpu(hv_synic_cleanup, NULL, 1); vmbus_cleanup(); |