---

yaml --- r: 228257 b: refs/heads/master c: 98293a2 h: refs/heads/master i: 228255: df1db47 v: v3
git-mirror · Dec 2, 2010 · 13c9afa · 13c9afa
1 parent 3add25a
commit 13c9afa
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 19 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2d6e882bada0ca7828347647c5b1091bf5f18fee
+refs/heads/master: 98293a279cc0ff085ead7c032c6b8cb7b6ad7e88
diff --git a/trunk/drivers/staging/hv/vmbus.c b/trunk/drivers/staging/hv/vmbus.c
@@ -57,9 +57,7 @@ static struct hv_device *gDevice; /* vmbus root device */
  */
 int VmbusChildDeviceAdd(struct hv_device *ChildDevice)
 {
-	struct vmbus_driver *vmbusDriver = (struct vmbus_driver *)gDriver;
-
-	return vmbusDriver->OnChildDeviceAdd(gDevice, ChildDevice);
+	return vmbus_child_device_register(gDevice, ChildDevice);
 }
 
 /*

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

diff --git a/trunk/drivers/staging/hv/vmbus_drv.c b/trunk/drivers/staging/hv/vmbus_drv.c
@@ -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_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,
 				      struct device_attribute *dev_attr,
 				      char *buf);
@@ -292,12 +290,6 @@ static int vmbus_bus_init(int (*drv_init)(struct hv_driver *drv))
 	int ret;
 	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 */
 	ret = drv_init(&vmbus_drv_obj->Base);
 	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
  */
-static int vmbus_child_device_register(struct hv_device *root_device_obj,
-				       struct hv_device *child_device_obj)
+int vmbus_child_device_register(struct hv_device *root_device_obj,
+				struct hv_device *child_device_obj)
 {
 	int ret = 0;
 	struct vm_device *root_device_ctx =

diff --git a/trunk/drivers/staging/hv/vmbus_private.h b/trunk/drivers/staging/hv/vmbus_private.h
@@ -107,7 +107,8 @@ struct hv_device *vmbus_child_device_create(struct hv_guid *deviceType,
 					 struct vmbus_channel *channel);
 
 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);
 
 /* static void */