It's only ever set to one function, so just call that function instead.
Cc: Haiyang Zhang <haiyangz@xxxxxxxxxxxxx>
Cc: Hank Janssen <hjanssen@xxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>
---
drivers/staging/hv/vmbus.c | 5 ++---
drivers/staging/hv/vmbus_api.h | 2 +-
drivers/staging/hv/vmbus_drv.c | 4 +---
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/hv/vmbus.c b/drivers/staging/hv/vmbus.c
index d7db7d0..09b0451 100644
--- a/drivers/staging/hv/vmbus.c
+++ b/drivers/staging/hv/vmbus.c
@@ -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;
diff --git a/drivers/staging/hv/vmbus_api.h b/drivers/staging/hv/vmbus_api.h
index 5974280..d0c30a7 100644
--- a/drivers/staging/hv/vmbus_api.h
+++ b/drivers/staging/hv/vmbus_api.h
@@ -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_ */
diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c
index 7323f33..4551a46 100644
--- a/drivers/staging/hv/vmbus_drv.c
+++ b/drivers/staging/hv/vmbus_drv.c
@@ -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) {
--
1.7.3.2
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
