mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Staging: hv: remove OnIsr vmbus_driver callback 

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:41:05 -08:00
parent 9d8bd71ad4
commit 097e310329
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -175,9 +175,9 @@ static void VmbusOnEventDPC(struct hv_driver *drv)
}
/*
* VmbusOnISR - ISR routine
* vmbus_on_isr - ISR routine
*/
static int VmbusOnISR(struct hv_driver *drv)
int vmbus_on_isr(struct hv_driver *drv)
{
int ret = 0;
int cpu = smp_processor_id();
@ -235,7 +235,6 @@ int VmbusInitialize(struct hv_driver *drv)
driver->Base.OnDeviceAdd = VmbusOnDeviceAdd;
driver->Base.OnDeviceRemove = VmbusOnDeviceRemove;
driver->Base.OnCleanup = VmbusOnCleanup;
driver->OnIsr = VmbusOnISR;
driver->OnMsgDpc = VmbusOnMsgDPC;
driver->OnEventDpc = VmbusOnEventDPC;
driver->GetChannelOffers = VmbusGetChannelOffers;

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

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

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

@ -873,10 +873,8 @@ static irqreturn_t vmbus_isr(int irq, void *dev_id)
struct vmbus_driver *vmbus_driver_obj = &g_vmbus_drv.drv_obj;
int ret;
/* ASSERT(vmbus_driver_obj->OnIsr != NULL); */
/* Call to bus driver to handle interrupt */
ret = vmbus_driver_obj->OnIsr(&vmbus_driver_obj->Base);
ret = vmbus_on_isr(&vmbus_driver_obj->Base);
/* Schedules a dpc if necessary */
if (ret > 0) {