Staging: hv: remove GetChannelInfo from struct vmbus_driver

It was only set to one value, so just make the call to
get_channel_info() directly.

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-10-20 16:00:37 -07:00
parent 40bc5360d7
commit e957bda0f4
3 changed files with 2 additions and 7 deletions

View File

@ -262,7 +262,6 @@ int VmbusInitialize(struct hv_driver *drv)
driver->OnMsgDpc = VmbusOnMsgDPC;
driver->OnEventDpc = VmbusOnEventDPC;
driver->GetChannelOffers = VmbusGetChannelOffers;
driver->GetChannelInfo = get_channel_info;
/* Hypervisor initialization...setup hypercall page..etc */
ret = HvInit();

View File

@ -183,9 +183,6 @@ struct vmbus_driver {
void (*OnMsgDpc)(struct hv_driver *driver);
void (*OnEventDpc)(struct hv_driver *driver);
void (*GetChannelOffers)(void);
void (*GetChannelInfo)(struct hv_device *dev,
struct hv_device_info *devinfo);
};
int VmbusInitialize(struct hv_driver *drv);

View File

@ -32,6 +32,7 @@
#include "osd.h"
#include "logging.h"
#include "vmbus.h"
#include "channel_interface.h"
/* FIXME! We need to do this dynamically for PIC and APIC system */
@ -470,9 +471,7 @@ EXPORT_SYMBOL(vmbus_get_interface);
static void vmbus_child_device_get_info(struct hv_device *device_obj,
struct hv_device_info *device_info)
{
struct vmbus_driver *vmbus_drv_obj = &g_vmbus_drv.drv_obj;
vmbus_drv_obj->GetChannelInfo(device_obj, device_info);
get_channel_info(device_obj, device_info);
}
/*