Skip to content

Commit

Permalink
Staging: hv: remove GetChannelOffers vmbus_driver callback
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Greg Kroah-Hartman committed Dec 2, 2010
1 parent c722bd3 commit 2d6e882
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 17 deletions.
9 changes: 0 additions & 9 deletions drivers/staging/hv/vmbus.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
*/
Expand Down Expand Up @@ -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();
Expand Down
3 changes: 0 additions & 3 deletions drivers/staging/hv/vmbus_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
7 changes: 2 additions & 5 deletions drivers/staging/hv/vmbus_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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",
Expand All @@ -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;
}
Expand Down

0 comments on commit 2d6e882

Please sign in to comment.