From d49ce7b2cc32aee7b6f7487c3e01594a14647d15 Mon Sep 17 00:00:00 2001
From: "K. Y. Srinivasan" <kys@microsoft.com>
Date: Thu, 10 Mar 2011 14:06:06 -0800
Subject: [PATCH] --- yaml --- r: 236539 b: refs/heads/master c:
 480ae58db525e57cc18611eec7ae24633d2e7efc h: refs/heads/master i:   236537:
 b5effe650d7cb5fc6ee30378159173251e10480c   236535:
 233cc7c89551f858be8957bf8c1b22b0074151a4 v: v3

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

diff --git a/[refs] b/[refs]
index 68fa85e25b65..cd845285c40e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6de3d6aa9ad455726eb7b689e2d3e57d89374e55
+refs/heads/master: 480ae58db525e57cc18611eec7ae24633d2e7efc
diff --git a/trunk/drivers/staging/hv/vmbus_drv.c b/trunk/drivers/staging/hv/vmbus_drv.c
index 4b4483b2e18e..8e8a408d6877 100644
--- a/trunk/drivers/staging/hv/vmbus_drv.c
+++ b/trunk/drivers/staging/hv/vmbus_drv.c
@@ -258,7 +258,7 @@ static void vmbus_on_msg_dpc(unsigned long data)
 /*
  * vmbus_on_isr - ISR routine
  */
-static int vmbus_on_isr(struct hv_driver *drv)
+static int vmbus_on_isr(void)
 {
 	int ret = 0;
 	int cpu = smp_processor_id();
@@ -989,8 +989,7 @@ static irqreturn_t vmbus_isr(int irq, void *dev_id)
 {
 	int ret;
 
-	/* Call to bus driver to handle interrupt */
-	ret = vmbus_on_isr(NULL);
+	ret = vmbus_on_isr();
 
 	/* Schedules a dpc if necessary */
 	if (ret > 0) {