OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
Greg Kroah-Hartman 2010-12-02 08:34:45 -08:00
parent 9205307cd8
commit 9d8bd71ad4
5 changed files with 4 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/staging/hv/channel_mgmt.c
View File

@ -413,7 +413,7 @@ static void vmbus_process_rescind_offer(void *context)
{
struct vmbus_channel *channel = context;
VmbusChildDeviceRemove(channel->device_obj);
vmbus_child_device_unregister(channel->device_obj);
}
/*
@ -847,7 +847,7 @@ void vmbus_release_unattached_channels(void)
"Releasing unattached device object %p",
channel->device_obj);
VmbusChildDeviceRemove(channel->device_obj);
vmbus_child_device_unregister(channel->device_obj);
free_channel(channel);
} else {
if (!start)

10
drivers/staging/hv/vmbus.c
View File

@ -70,16 +70,6 @@ int VmbusChildDeviceAdd(struct hv_device *ChildDevice)
return vmbusDriver->OnChildDeviceAdd(gDevice, ChildDevice);
}
/*
* VmbusChildDeviceRemove Unregisters the child device from the vmbus
*/
void VmbusChildDeviceRemove(struct hv_device *ChildDevice)
{
struct vmbus_driver *vmbusDriver = (struct vmbus_driver *)gDriver;
vmbusDriver->OnChildDeviceRemove(ChildDevice);
}
/*
* VmbusOnDeviceAdd - Callback when the root bus device is added
*/

1
drivers/staging/hv/vmbus_api.h
View File

@ -124,7 +124,6 @@ struct vmbus_driver {
/* Set by the caller */
int (*OnChildDeviceAdd)(struct hv_device *RootDevice,
struct hv_device *ChildDevice);
void (*OnChildDeviceRemove)(struct hv_device *device);
/* Set by the callee */
int (*OnIsr)(struct hv_driver *driver);

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

@ -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);

2
drivers/staging/hv/vmbus_private.h
View File

@ -108,7 +108,7 @@ struct hv_device *vmbus_child_device_create(struct hv_guid *deviceType,
int VmbusChildDeviceAdd(struct hv_device *Device);
void VmbusChildDeviceRemove(struct hv_device *Device);
void vmbus_child_device_unregister(struct hv_device *device_obj);
/* static void */
/* VmbusChildDeviceDestroy( */