diff options
| -rw-r--r-- | drivers/staging/hv/connection.c | 2 | ||||
| -rw-r--r-- | drivers/staging/hv/vmbus_drv.c | 11 | ||||
| -rw-r--r-- | drivers/staging/hv/vmbus_private.h | 2 |
3 files changed, 3 insertions, 12 deletions
diff --git a/drivers/staging/hv/connection.c b/drivers/staging/hv/connection.c index f7df47934cf9..fd589e381e31 100644 --- a/drivers/staging/hv/connection.c +++ b/drivers/staging/hv/connection.c @@ -285,7 +285,7 @@ static void process_chn_event(void *context) /* * vmbus_on_event - Handler for events */ -void vmbus_on_event(void) +void vmbus_on_event(unsigned long data) { int dword; int maxdword = MAX_NUM_CHANNELS_SUPPORTED >> 5; diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c index 7e679331f648..4b4483b2e18e 100644 --- a/drivers/staging/hv/vmbus_drv.c +++ b/drivers/staging/hv/vmbus_drv.c @@ -56,7 +56,6 @@ static int vmbus_probe(struct device *device); static int vmbus_remove(struct device *device); static void vmbus_shutdown(struct device *device); static int vmbus_uevent(struct device *device, struct kobj_uevent_env *env); -static void vmbus_event_dpc(unsigned long data); static irqreturn_t vmbus_isr(int irq, void *dev_id); @@ -485,7 +484,7 @@ static int vmbus_bus_init(void) /* Initialize the bus context */ tasklet_init(&vmbus_drv_ctx->msg_dpc, vmbus_on_msg_dpc, (unsigned long)NULL); - tasklet_init(&vmbus_drv_ctx->event_dpc, vmbus_event_dpc, + tasklet_init(&vmbus_drv_ctx->event_dpc, vmbus_on_event, (unsigned long)NULL); /* Now, register the bus with LDM */ @@ -985,14 +984,6 @@ static void vmbus_device_release(struct device *device) } -/* - * vmbus_event_dpc - Tasklet routine to handle hypervisor events - */ -static void vmbus_event_dpc(unsigned long data) -{ - /* Call to bus driver to handle interrupt */ - vmbus_on_event(); -} static irqreturn_t vmbus_isr(int irq, void *dev_id) { diff --git a/drivers/staging/hv/vmbus_private.h b/drivers/staging/hv/vmbus_private.h index 9f505c44c600..1b88b6f9be08 100644 --- a/drivers/staging/hv/vmbus_private.h +++ b/drivers/staging/hv/vmbus_private.h @@ -129,7 +129,7 @@ int vmbus_post_msg(void *buffer, size_t buflen); int vmbus_set_event(u32 child_relid); -void vmbus_on_event(void); +void vmbus_on_event(unsigned long data); #endif /* _VMBUS_PRIVATE_H_ */ |