From 836a6d33d4590cec9738c8751b5c82f4e00238b1 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 2 Dec 2010 12:12:46 -0800 Subject: [PATCH] --- yaml --- r: 228265 b: refs/heads/master c: bafbb8df076de1e3b63914473a403fba96b88f3c h: refs/heads/master i: 228263: 6c8e5880fe6a55f4d0bbd8ce459e1ad256ee0dc2 v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/vmbus_drv.c | 13 +------------ 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/[refs] b/[refs] index 69c893fc9c06..14efb622b428 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cef6dbfa8ef6b8c474e020a24758aa848a2632fa +refs/heads/master: bafbb8df076de1e3b63914473a403fba96b88f3c diff --git a/trunk/drivers/staging/hv/vmbus_drv.c b/trunk/drivers/staging/hv/vmbus_drv.c index f623b57c59d0..d794b603bf17 100644 --- a/trunk/drivers/staging/hv/vmbus_drv.c +++ b/trunk/drivers/staging/hv/vmbus_drv.c @@ -250,15 +250,6 @@ static void vmbus_on_msg_dpc(struct hv_driver *drv) } } -/* - * vmbus_on_event_dpc - DPC routine to handle events from the hypervisior - */ -static void vmbus_on_event_dpc(struct hv_driver *drv) -{ - /* TODO: Process any events */ - VmbusOnEvents(); -} - /* * vmbus_on_isr - ISR routine */ @@ -1039,10 +1030,8 @@ static void vmbus_msg_dpc(unsigned long data) */ static void vmbus_event_dpc(unsigned long data) { - struct hv_driver *driver = (struct hv_driver *)data; - /* Call to bus driver to handle interrupt */ - vmbus_on_event_dpc(driver); + VmbusOnEvents(); } static irqreturn_t vmbus_isr(int irq, void *dev_id)