mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-04 08:08:54 +00:00
Code Issues Releases Wiki Activity

Staging: hv: remove OnMsgDpc vmbus_driver callback

Browse source 
It's only ever set to one function, so just call that function instead.

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:44:48 -08:00
parent 097e310329
commit 4a1494fc10
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -119,9 +119,9 @@ static void VmbusOnCleanup(struct hv_driver *drv)
} }
/* /*
* VmbusOnMsgDPC - DPC routine to handle messages from the hypervisior * vmbus_on_msg_dpc - DPC routine to handle messages from the hypervisior
*/ */
static void VmbusOnMsgDPC(struct hv_driver *drv) void vmbus_on_msg_dpc(struct hv_driver *drv)
{ {
int cpu = smp_processor_id(); int cpu = smp_processor_id();
void *page_addr = hv_context.synic_message_page[cpu]; void *page_addr = hv_context.synic_message_page[cpu];
@ -235,7 +235,6 @@ int VmbusInitialize(struct hv_driver *drv)
driver->Base.OnDeviceAdd = VmbusOnDeviceAdd; driver->Base.OnDeviceAdd = VmbusOnDeviceAdd;
driver->Base.OnDeviceRemove = VmbusOnDeviceRemove; driver->Base.OnDeviceRemove = VmbusOnDeviceRemove;
driver->Base.OnCleanup = VmbusOnCleanup; driver->Base.OnCleanup = VmbusOnCleanup;
driver->OnMsgDpc = VmbusOnMsgDPC;
driver->OnEventDpc = VmbusOnEventDPC; driver->OnEventDpc = VmbusOnEventDPC;
driver->GetChannelOffers = VmbusGetChannelOffers; driver->GetChannelOffers = VmbusGetChannelOffers;

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

@ -126,12 +126,12 @@ struct vmbus_driver {
struct hv_device *ChildDevice); struct hv_device *ChildDevice);
/* Set by the callee */ /* Set by the callee */
void (*OnMsgDpc)(struct hv_driver *driver);
void (*OnEventDpc)(struct hv_driver *driver); void (*OnEventDpc)(struct hv_driver *driver);
void (*GetChannelOffers)(void); void (*GetChannelOffers)(void);
}; };
int VmbusInitialize(struct hv_driver *drv); int VmbusInitialize(struct hv_driver *drv);
int vmbus_on_isr(struct hv_driver *drv); int vmbus_on_isr(struct hv_driver *drv);
void vmbus_on_msg_dpc(struct hv_driver *drv);
#endif /* _VMBUS_API_H_ */ #endif /* _VMBUS_API_H_ */

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

@ -849,14 +849,12 @@ static void vmbus_msg_dpc(unsigned long data)
{ {
struct vmbus_driver *vmbus_drv_obj = (struct vmbus_driver *)data; struct vmbus_driver *vmbus_drv_obj = (struct vmbus_driver *)data;
/* ASSERT(vmbus_drv_obj->OnMsgDpc != NULL); */
/* Call to bus driver to handle interrupt */ /* Call to bus driver to handle interrupt */
vmbus_drv_obj->OnMsgDpc(&vmbus_drv_obj->Base); vmbus_on_msg_dpc(&vmbus_drv_obj->Base);
} }
/* /*
* vmbus_msg_dpc - Tasklet routine to handle hypervisor events * vmbus_event_dpc - Tasklet routine to handle hypervisor events
*/ */
static void vmbus_event_dpc(unsigned long data) static void vmbus_event_dpc(unsigned long data)
{ {