dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Staging: hv: Get rid of the forward declaration for vmbus_remove 

Get rid of the forward declaration of vmbus_remove by moving
the code around.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Mike Sterling <mike.sterling@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
K. Y. Srinivasan 2011-03-15 15:03:40 -07:00 committed by Greg Kroah-Hartman
parent f1f0d67b6e
commit c5dce3db89
1 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
drivers/staging/hv/vmbus_drv.c
View File

@ -47,7 +47,6 @@ struct hv_bus {
struct tasklet_struct event_dpc;
};
static int vmbus_remove(struct device *device);
static void vmbus_shutdown(struct device *device);
static irqreturn_t vmbus_isr(int irq, void *dev_id);
@ -248,6 +247,35 @@ static int vmbus_probe(struct device *child_device)
return ret;
}
/*
* vmbus_remove - Remove a vmbus device
*/
static int vmbus_remove(struct device *child_device)
{
int ret;
struct hv_driver *drv;
if (child_device->driver) {
drv = drv_to_hv_drv(child_device->driver);
/*
* Let the specific open-source driver handles the removal if
* it can
*/
if (drv->driver.remove) {
ret = drv->driver.remove(child_device);
} else {
DPRINT_ERR(VMBUS_DRV,
"remove() method not set for driver - %s",
child_device->driver->name);
ret = -1;
}
}
return 0;
}
/* The one and only one */
static struct hv_bus hv_bus = {
.bus.name = "vmbus",
@ -776,35 +804,6 @@ void vmbus_child_device_unregister(struct hv_device *device_obj)
&device_obj->device);
}
/*
* vmbus_remove - Remove a vmbus device
*/
static int vmbus_remove(struct device *child_device)
{
int ret;
struct hv_driver *drv;
if (child_device->driver) {
drv = drv_to_hv_drv(child_device->driver);
/*
* Let the specific open-source driver handles the removal if
* it can
*/
if (drv->driver.remove) {
ret = drv->driver.remove(child_device);
} else {
DPRINT_ERR(VMBUS_DRV,
"remove() method not set for driver - %s",
child_device->driver->name);
ret = -1;
}
}
return 0;
}
/*
* vmbus_shutdown - Shutdown a vmbus device
*/