Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 248911
b: refs/heads/master
c: eb1bb25
h: refs/heads/master
i:
  248909: dc86401
  248907: b38de61
  248903: 3f7c0f4
  248895: a92d837
v: v3
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed Apr 5, 2011
1 parent d65b05b commit e779f96
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 23 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: c5dce3db89def8e35d30521e187a0e8127937dd0
refs/heads/master: eb1bb259cf216be0cd924e76e2185c7fb2c7e8ee
44 changes: 22 additions & 22 deletions trunk/drivers/staging/hv/vmbus_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ struct hv_bus {
struct tasklet_struct event_dpc;
};

static void vmbus_shutdown(struct device *device);

static irqreturn_t vmbus_isr(int irq, void *dev_id);

Expand Down Expand Up @@ -276,6 +275,28 @@ static int vmbus_remove(struct device *child_device)
return 0;
}


/*
* vmbus_shutdown - Shutdown a vmbus device
*/
static void vmbus_shutdown(struct device *child_device)
{
struct hv_driver *drv;


/* The device may not be attached yet */
if (!child_device->driver)
return;

drv = drv_to_hv_drv(child_device->driver);

/* Let the specific open-source driver handles the removal if it can */
if (drv->driver.shutdown)
drv->driver.shutdown(child_device);

return;
}

/* The one and only one */
static struct hv_bus hv_bus = {
.bus.name = "vmbus",
Expand Down Expand Up @@ -804,27 +825,6 @@ void vmbus_child_device_unregister(struct hv_device *device_obj)
&device_obj->device);
}

/*
* vmbus_shutdown - Shutdown a vmbus device
*/
static void vmbus_shutdown(struct device *child_device)
{
struct hv_driver *drv;


/* The device may not be attached yet */
if (!child_device->driver)
return;

drv = drv_to_hv_drv(child_device->driver);

/* Let the specific open-source driver handles the removal if it can */
if (drv->driver.shutdown)
drv->driver.shutdown(child_device);

return;
}


/*
* vmbus_device_release - Final callback release of the vmbus child device
Expand Down

0 comments on commit e779f96

Please sign in to comment.