From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 2 Dec 2010 16:47:11 +0000 (-0800)
Subject: Staging: hv: remove OnEventDpc vmbus_driver callback
X-Git-Tag: v2.6.38-rc1~423^2~150
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c722bd3e2cb92be7afec346894faa29605436c1a;p=platform%2Fkernel%2Flinux-stable.git

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 df986be..3aeedf6 100644
--- 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 332a92d..31549c9 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 */
-	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 d57f54d..d075d96 100644
--- 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)