From df1db47f21de2b9d0588c3744b9802f20c71211e Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 2 Dec 2010 08:47:11 -0800
Subject: [PATCH] --- yaml --- r: 228255 b: refs/heads/master c:
 c722bd3e2cb92be7afec346894faa29605436c1a h: refs/heads/master i:   228253:
 e6d5a670234a3fcc2698b60956c314d7944cef30   228251:
 67bb1e8d568ac4a9dabd1eeb6d27992553bfea7c   228247:
 0e89226be897b2b5e429796305a7056dd51e624a   228239:
 09d1b2ec2e464f83a325d57e6e730017ca836955   228223:
 05d26015b9701baa38022911b3b143518621664c v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/staging/hv/vmbus.c     | 5 ++---
 trunk/drivers/staging/hv/vmbus_api.h | 2 +-
 trunk/drivers/staging/hv/vmbus_drv.c | 4 +---
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 0ffbcff68213..3339f8e01784 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4a1494fc101b05f895ef52b9d01769d382c5a6e2
+refs/heads/master: c722bd3e2cb92be7afec346894faa29605436c1a
diff --git a/trunk/drivers/staging/hv/vmbus.c b/trunk/drivers/staging/hv/vmbus.c
index df986be8bb84..3aeedf6026e3 100644
--- a/trunk/drivers/staging/hv/vmbus.c
+++ b/trunk/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/trunk/drivers/staging/hv/vmbus_api.h b/trunk/drivers/staging/hv/vmbus_api.h
index 332a92d2cfd3..31549c9579ba 100644
--- a/trunk/drivers/staging/hv/vmbus_api.h
+++ b/trunk/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/trunk/drivers/staging/hv/vmbus_drv.c b/trunk/drivers/staging/hv/vmbus_drv.c
index d57f54db2a5a..d075d9624279 100644
--- a/trunk/drivers/staging/hv/vmbus_drv.c
+++ b/trunk/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)