Skip to content

Commit

Permalink
Staging: hv: Get rid of vmbus_dev_rm() function
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed Mar 14, 2011
1 parent 480ae58 commit f51b359
Showing 1 changed file with 3 additions and 14 deletions.
17 changes: 3 additions & 14 deletions drivers/staging/hv/vmbus_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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();

Expand Down

0 comments on commit f51b359

Please sign in to comment.