No one ever calls it so get rid of it, it's pointless.
Cc: Haiyang Zhang <haiya...@microsoft.com>
Cc: Hank Janssen <hjans...@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gre...@suse.de>
---
drivers/staging/hv/vmbus_api.h | 1 -
drivers/staging/hv/vmbus_drv.c | 10 ----------
2 files changed, 0 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/hv/vmbus_api.h b/drivers/staging/hv/vmbus_api.h
index e26365c..189b672 100644
--- a/drivers/staging/hv/vmbus_api.h
+++ b/drivers/staging/hv/vmbus_api.h
@@ -122,7 +122,6 @@ struct vmbus_driver {
struct hv_driver Base;
/* Set by the caller */
- void (*OnChildDeviceDestroy)(struct hv_device *device);
int (*OnChildDeviceAdd)(struct hv_device *RootDevice,
struct hv_device *ChildDevice);
void (*OnChildDeviceRemove)(struct hv_device *device);
diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c
index 224e844..656e954 100644
--- a/drivers/staging/hv/vmbus_drv.c
+++ b/drivers/staging/hv/vmbus_drv.c
@@ -69,7 +69,6 @@ static irqreturn_t vmbus_isr(int irq, void *dev_id);
static void vmbus_device_release(struct device *device);
static void vmbus_bus_release(struct device *device);
-static void vmbus_child_device_destroy(struct hv_device *device_obj);
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);
@@ -298,7 +297,6 @@ static int vmbus_bus_init(int (*drv_init)(struct hv_driver
*drv))
* Set this up to allow lower layer to callback to add/remove child
* devices on the bus
*/
- vmbus_drv_obj->OnChildDeviceDestroy = vmbus_child_device_destroy;
vmbus_drv_obj->OnChildDeviceAdd = vmbus_child_device_register;
vmbus_drv_obj->OnChildDeviceRemove = vmbus_child_device_unregister;
@@ -600,13 +598,6 @@ static void vmbus_child_device_unregister(struct hv_device
*device_obj)
}
/*
- * vmbus_child_device_destroy - Destroy the specified child device on the
vmbus.
- */
-static void vmbus_child_device_destroy(struct hv_device *device_obj)
-{
-}
-
-/*
* vmbus_uevent - add uevent for our device
*
* This routine is invoked when a device is added or removed on the vmbus to
@@ -848,7 +839,6 @@ static void vmbus_device_release(struct device *device)
{
struct vm_device *device_ctx = device_to_vm_device(device);
- /* vmbus_child_device_destroy(&device_ctx->device_obj); */
kfree(device_ctx);
/* !!DO NOT REFERENCE device_ctx anymore at this point!! */
--
1.7.3.2
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
