summaryrefslogtreecommitdiffstats
path: root/drivers/staging/hv/vmbus_drv.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman2010-12-02 17:34:45 +0100
committerGreg Kroah-Hartman2010-12-02 17:34:45 +0100
commit9d8bd71ad4f295f80450b5089d239c3135802699 (patch)
tree162c0e7ff8beefef07f704c7a882fd81f0f6cd32 /drivers/staging/hv/vmbus_drv.c
parentStaging: hv: remove OnChildDeviceDestroy vmbus_driver callback (diff)
downloadkernel-qcow2-linux-9d8bd71ad4f295f80450b5089d239c3135802699.tar.gz
kernel-qcow2-linux-9d8bd71ad4f295f80450b5089d239c3135802699.tar.xz
kernel-qcow2-linux-9d8bd71ad4f295f80450b5089d239c3135802699.zip
Staging: hv: remove OnChildDeviceRemove 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>
Diffstat (limited to 'drivers/staging/hv/vmbus_drv.c')
-rw-r--r--drivers/staging/hv/vmbus_drv.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c
index 656e9541e5ec..7323f334f83e 100644
--- a/drivers/staging/hv/vmbus_drv.c
+++ b/drivers/staging/hv/vmbus_drv.c
@@ -71,7 +71,6 @@ static void vmbus_bus_release(struct device *device);
static int vmbus_child_device_register(struct hv_device *root_device_obj,
struct hv_device *child_device_obj);
-static void vmbus_child_device_unregister(struct hv_device *child_device_obj);
static ssize_t vmbus_show_device_attr(struct device *dev,
struct device_attribute *dev_attr,
char *buf);
@@ -298,7 +297,6 @@ static int vmbus_bus_init(int (*drv_init)(struct hv_driver *drv))
* devices on the bus
*/
vmbus_drv_obj->OnChildDeviceAdd = vmbus_child_device_register;
- vmbus_drv_obj->OnChildDeviceRemove = vmbus_child_device_unregister;
/* Call to bus driver to initialize */
ret = drv_init(&vmbus_drv_obj->Base);
@@ -580,7 +578,7 @@ static int vmbus_child_device_register(struct hv_device *root_device_obj,
* vmbus_child_device_unregister - Remove the specified child device
* from the vmbus.
*/
-static void vmbus_child_device_unregister(struct hv_device *device_obj)
+void vmbus_child_device_unregister(struct hv_device *device_obj)
{
struct vm_device *device_ctx = to_vm_device(device_obj);