Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 228255
b: refs/heads/master
c: c722bd3
h: refs/heads/master
i:
  228253: e6d5a67
  228251: 67bb1e8
  228247: 0e89226
  228239: 09d1b2e
  228223: 05d2601
v: v3
  • Loading branch information
Greg Kroah-Hartman committed Dec 2, 2010
1 parent 2c305b6 commit df1db47
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4a1494fc101b05f895ef52b9d01769d382c5a6e2
refs/heads/master: c722bd3e2cb92be7afec346894faa29605436c1a
5 changes: 2 additions & 3 deletions trunk/drivers/staging/hv/vmbus.c
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/staging/hv/vmbus_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -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_ */
4 changes: 1 addition & 3 deletions trunk/drivers/staging/hv/vmbus_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit df1db47

Please sign in to comment.