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) {