Staging: hv: remove OnEventDpc 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 df986be8bb84d8343ebc161237ed2daf0b90cba1..3aeedf6026e33cef33903ef6cee872a2a44b24a9 100644 (file)
--- a/drivers/staging/hv/vmbus.c
+++ b/drivers/staging/hv/vmbus.c
@@ -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 */
        VmbusOnEvents();
@@ -235,7 +235,6 @@ int VmbusInitialize(struct hv_driver *drv)
        driver->Base.OnDeviceAdd        = VmbusOnDeviceAdd;
        driver->Base.OnDeviceRemove     = VmbusOnDeviceRemove;
        driver->Base.OnCleanup          = VmbusOnCleanup;
-       driver->OnEventDpc              = VmbusOnEventDPC;
        driver->GetChannelOffers        = VmbusGetChannelOffers;
 
        /* Hypervisor initialization...setup hypercall page..etc */

diff --git a/drivers/staging/hv/vmbus_api.h b/drivers/staging/hv/vmbus_api.h
index 332a92d2cfd3d96480f4234ef407340819ff4ebf..31549c9579baef29704907d8a8354ea9f83af99b 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 */
-       void (*OnEventDpc)(struct hv_driver *driver);
        void (*GetChannelOffers)(void);
 };
 
 int VmbusInitialize(struct hv_driver *drv);
 int vmbus_on_isr(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_ */

diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c
index d57f54db2a5ab66238d2988e6a848d0e1db30352..d075d962427906c89153261f7e0bfb34eeb61545 100644 (file)
--- a/drivers/staging/hv/vmbus_drv.c
+++ b/drivers/staging/hv/vmbus_drv.c
@@ -860,10 +860,8 @@ static void vmbus_event_dpc(unsigned long data)
 {
        struct vmbus_driver *vmbus_drv_obj = (struct vmbus_driver *)data;
 
-       /* ASSERT(vmbus_drv_obj->OnEventDpc != NULL); */
-
        /* 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)