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>

diff --git a/drivers/staging/hv/vmbus.c b/drivers/staging/hv/vmbus.c
index d7db7d0f5ee6c5589d9c1051dbb24168c13f963d..09b04517ee097fddcf532891d623772a53d4b235 100644 (file)
--- 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 59742800b06e8283547519db323c3062c92fb626..d0c30a725c7aef7db634be855d01090f367462bc 100644 (file)
--- 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 7323f334f83eb6a6792ed229e89ba8c34fa9f775..4551a469832d3e6f4afbb1e717b2275fa92e5ebd 100644 (file)
--- 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) {