forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Staging: hv: remove OnEventDpc 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:47:11 -08:00
parent 4a1494fc10
commit c722bd3e2c
3 changed files with 4 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -166,9 +166,9 @@ void vmbus_on_msg_dpc(struct hv_driver *drv)
} }
/* /*
* VmbusOnEventDPC - DPC routine to handle events from the hypervisior * vmbus_on_event_dpc - DPC routine to handle events from the hypervisior
*/ */
static void VmbusOnEventDPC(struct hv_driver *drv) void vmbus_on_event_dpc(struct hv_driver *drv)
{ {
/* TODO: Process any events */ /* TODO: Process any events */
VmbusOnEvents(); VmbusOnEvents();
@ -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->OnEventDpc = VmbusOnEventDPC;
driver->GetChannelOffers = VmbusGetChannelOffers; driver->GetChannelOffers = VmbusGetChannelOffers;
/* Hypervisor initialization...setup hypercall page..etc */ /* Hypervisor initialization...setup hypercall page..etc */

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 (*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); void vmbus_on_msg_dpc(struct hv_driver *drv);
void vmbus_on_event_dpc(struct hv_driver *drv);
#endif /* _VMBUS_API_H_ */ #endif /* _VMBUS_API_H_ */

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

@ -860,10 +860,8 @@ static void vmbus_event_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->OnEventDpc != NULL); */
/* Call to bus driver to handle interrupt */ /* Call to bus driver to handle interrupt */
vmbus_drv_obj->OnEventDpc(&vmbus_drv_obj->Base); vmbus_on_event_dpc(&vmbus_drv_obj->Base);
} }
static irqreturn_t vmbus_isr(int irq, void *dev_id) static irqreturn_t vmbus_isr(int irq, void *dev_id)