diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-20 16:00:37 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-10-20 16:00:37 -0700 |
| commit | e957bda0f4c88b29a027be23f4cc05f2abab2329 (patch) | |
| tree | e1d19072a4f75d00f39de54ae0f0fb80d8c64b78 /drivers/staging | |
| parent | 40bc5360d7fe6fae4ec454c1dca90d6cdaa7e448 (diff) | |
| download | talos-obmc-linux-e957bda0f4c88b29a027be23f4cc05f2abab2329.tar.gz talos-obmc-linux-e957bda0f4c88b29a027be23f4cc05f2abab2329.zip | |
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>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/hv/vmbus.c | 1 | ||||
| -rw-r--r-- | drivers/staging/hv/vmbus_api.h | 3 | ||||
| -rw-r--r-- | drivers/staging/hv/vmbus_drv.c | 5 |
3 files changed, 2 insertions, 7 deletions
diff --git a/drivers/staging/hv/vmbus.c b/drivers/staging/hv/vmbus.c index 6e13c1c976f1..ffdbd30e3ba5 100644 --- a/drivers/staging/hv/vmbus.c +++ b/drivers/staging/hv/vmbus.c @@ -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(); diff --git a/drivers/staging/hv/vmbus_api.h b/drivers/staging/hv/vmbus_api.h index 0f79216252de..fdd6c59a0efd 100644 --- a/drivers/staging/hv/vmbus_api.h +++ b/drivers/staging/hv/vmbus_api.h @@ -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); diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c index ad298871d3f3..68d95eb7f929 100644 --- a/drivers/staging/hv/vmbus_drv.c +++ b/drivers/staging/hv/vmbus_drv.c @@ -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); } /* |
