evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Staging: hv: remove GetChannelInfo from struct vmbus_driver

Browse source 
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
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/staging/hv/vmbus.c
View file

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

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

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

5
drivers/staging/hv/vmbus_drv.c
View file

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