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

Staging: hv: remove OnChildDeviceAdd 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 09:16:04 -08:00
parent 2d6e882bad
commit 98293a279c
4 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,9 +57,7 @@ static struct hv_device *gDevice; /* vmbus root device */
*/ */
int VmbusChildDeviceAdd(struct hv_device *ChildDevice) int VmbusChildDeviceAdd(struct hv_device *ChildDevice)
{ {
struct vmbus_driver *vmbusDriver = (struct vmbus_driver *)gDriver; return vmbus_child_device_register(gDevice, ChildDevice);
return vmbusDriver->OnChildDeviceAdd(gDevice, ChildDevice);
} }
/* /*

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

@ -120,10 +120,6 @@ struct vmbus_driver {
/* !! Must be the 1st field !! */ /* !! Must be the 1st field !! */
/* FIXME if ^, then someone is doing somthing stupid */ /* FIXME if ^, then someone is doing somthing stupid */
struct hv_driver Base; struct hv_driver Base;
/* Set by the caller */
int (*OnChildDeviceAdd)(struct hv_device *RootDevice,
struct hv_device *ChildDevice);
}; };
int VmbusInitialize(struct hv_driver *drv); int VmbusInitialize(struct hv_driver *drv);

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

@ -69,8 +69,6 @@ static irqreturn_t vmbus_isr(int irq, void *dev_id);
static void vmbus_device_release(struct device *device); static void vmbus_device_release(struct device *device);
static void vmbus_bus_release(struct device *device); 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 ssize_t vmbus_show_device_attr(struct device *dev, static ssize_t vmbus_show_device_attr(struct device *dev,
struct device_attribute *dev_attr, struct device_attribute *dev_attr,
char *buf); char *buf);
@ -292,12 +290,6 @@ static int vmbus_bus_init(int (*drv_init)(struct hv_driver *drv))
int ret; int ret;
unsigned int vector; unsigned int vector;
/*
* Set this up to allow lower layer to callback to add/remove child
* devices on the bus
*/
vmbus_drv_obj->OnChildDeviceAdd = vmbus_child_device_register;
/* Call to bus driver to initialize */ /* Call to bus driver to initialize */
ret = drv_init(&vmbus_drv_obj->Base); ret = drv_init(&vmbus_drv_obj->Base);
if (ret != 0) { if (ret != 0) {
@ -530,8 +522,8 @@ struct hv_device *vmbus_child_device_create(struct hv_guid *type,
/* /*
* vmbus_child_device_register - Register the child device on the specified bus * vmbus_child_device_register - Register the child device on the specified bus
*/ */
static int vmbus_child_device_register(struct hv_device *root_device_obj, int vmbus_child_device_register(struct hv_device *root_device_obj,
struct hv_device *child_device_obj) struct hv_device *child_device_obj)
{ {
int ret = 0; int ret = 0;
struct vm_device *root_device_ctx = struct vm_device *root_device_ctx =

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

@ -107,7 +107,8 @@ struct hv_device *vmbus_child_device_create(struct hv_guid *deviceType,
struct vmbus_channel *channel); struct vmbus_channel *channel);
int VmbusChildDeviceAdd(struct hv_device *Device); int VmbusChildDeviceAdd(struct hv_device *Device);
int vmbus_child_device_register(struct hv_device *root_device_obj,
struct hv_device *child_device_obj);
void vmbus_child_device_unregister(struct hv_device *device_obj); void vmbus_child_device_unregister(struct hv_device *device_obj);
/* static void */ /* static void */