diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-02 16:47:11 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-02 16:47:11 (GMT) |
| commit | c722bd3e2cb92be7afec346894faa29605436c1a (patch) | |
| tree | f95868ab7341948c756ea20cb7814ad9b6023d9a | |
| parent | 4a1494fc101b05f895ef52b9d01769d382c5a6e2 (diff) | |
| download | linux-c722bd3e2cb92be7afec346894faa29605436c1a.tar.xz | |
Staging: hv: remove OnEventDpc vmbus_driver callback
It's only ever set to one function, so just call that function instead.
Cc: Haiyang Zhang <haiyangz@microsoft.com>
Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/staging/hv/vmbus.c | 5 | ||||
| -rw-r--r-- | drivers/staging/hv/vmbus_api.h | 2 | ||||
| -rw-r--r-- | drivers/staging/hv/vmbus_drv.c | 4 |
3 files changed, 4 insertions, 7 deletions
diff --git a/drivers/staging/hv/vmbus.c b/drivers/staging/hv/vmbus.c index df986be..3aeedf6 100644 --- a/drivers/staging/hv/vmbus.c +++ b/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/drivers/staging/hv/vmbus_api.h b/drivers/staging/hv/vmbus_api.h index 332a92d..31549c9 100644 --- a/drivers/staging/hv/vmbus_api.h +++ b/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/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c index d57f54d..d075d96 100644 --- a/drivers/staging/hv/vmbus_drv.c +++ b/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) |