AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

Staging: hv: remove GetChannelOffers vmbus_driver callback

Browse Source 
It's only ever set to one function, so just call that function instead.
Actually, that wrapper function only ever called vmbus_request_offers()
so just call that function instead, no need for a do-nothing
intermediate step here.

Cc: Haiyang Zhang <haiyangz@microsoft.com>
Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2010-12-02 08:50:58 -08:00
parent c722bd3e2c
commit 2d6e882bad
3 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/staging/hv/vmbus.c
View File

@ -52,14 +52,6 @@ static const struct hv_guid gVmbusDeviceId = {
static struct hv_driver *gDriver; /* vmbus driver object */
static struct hv_device *gDevice; /* vmbus root device */
/*
* VmbusGetChannelOffers - Retrieve the channel offers from the parent partition
*/
static void VmbusGetChannelOffers(void)
{
vmbus_request_offers();
}
/*
* VmbusChildDeviceAdd - Registers the child device with the vmbus
*/
@ -235,7 +227,6 @@ int VmbusInitialize(struct hv_driver *drv)
driver->Base.OnDeviceAdd = VmbusOnDeviceAdd;
driver->Base.OnDeviceRemove = VmbusOnDeviceRemove;
driver->Base.OnCleanup = VmbusOnCleanup;
driver->GetChannelOffers = VmbusGetChannelOffers;
/* Hypervisor initialization...setup hypercall page..etc */
ret = hv_init();

3
drivers/staging/hv/vmbus_api.h
View File

@ -124,9 +124,6 @@ struct vmbus_driver {
/* Set by the caller */
int (*OnChildDeviceAdd)(struct hv_device *RootDevice,
struct hv_device *ChildDevice);
/* Set by the callee */
void (*GetChannelOffers)(void);
};
int VmbusInitialize(struct hv_driver *drv);

7
drivers/staging/hv/vmbus_drv.c
View File

@ -387,9 +387,7 @@ static int vmbus_bus_init(int (*drv_init)(struct hv_driver *drv))
goto cleanup;
}
vmbus_drv_obj->GetChannelOffers();
vmbus_request_offers();
wait_for_completion(&hv_channel_ready);
cleanup:
@ -441,7 +439,6 @@ static void vmbus_bus_exit(void)
*/
int vmbus_child_driver_register(struct driver_context *driver_ctx)
{
struct vmbus_driver *vmbus_drv_obj = &g_vmbus_drv.drv_obj;
int ret;
DPRINT_INFO(VMBUS_DRV, "child driver (%p) registering - name %s",
@ -452,7 +449,7 @@ int vmbus_child_driver_register(struct driver_context *driver_ctx)
ret = driver_register(&driver_ctx->driver);
vmbus_drv_obj->GetChannelOffers();
vmbus_request_offers();
return ret;
}