[PATCH 110/117] Staging: hv: vmbus: Change the signature of vmbus_child_driver_register()

K. Y. Srinivasan
2011-07-15T17:32:03Z

Change the signature of vmbus_child_driver_register() to conform to the
Linux driver model.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
---
drivers/staging/hv/hv_mouse.c | 2 +-
drivers/staging/hv/hv_util.c | 2 +-
drivers/staging/hv/hyperv.h | 2 +-
drivers/staging/hv/netvsc_drv.c | 2 +-
drivers/staging/hv/storvsc_drv.c | 2 +-
drivers/staging/hv/vmbus_drv.c | 3 ++-
6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/hv/hv_mouse.c b/drivers/staging/hv/hv_mouse.c
index 6e1c4ce..0dfaa6a 100644
--- a/drivers/staging/hv/hv_mouse.c
+++ b/drivers/staging/hv/hv_mouse.c
@@ -948,7 +948,7 @@ static int __init mousevsc_init(void)
drv->driver.name = driver_name;

/* The driver belongs to vmbus */
- vmbus_child_driver_register(&drv->driver);
+ vmbus_child_driver_register(drv);

return 0;
}
diff --git a/drivers/staging/hv/hv_util.c b/drivers/staging/hv/hv_util.c
index 26693dd..a4320dc 100644
--- a/drivers/staging/hv/hv_util.c
+++ b/drivers/staging/hv/hv_util.c
@@ -300,7 +300,7 @@ static int __init init_hyperv_utils(void)

util_drv.driver.name = driver_name;

- return vmbus_child_driver_register(&util_drv.driver);
+ return vmbus_child_driver_register(&util_drv);
}

static void exit_hyperv_utils(void)
diff --git a/drivers/staging/hv/hyperv.h b/drivers/staging/hv/hyperv.h
index 82ba110..a760e89 100644
--- a/drivers/staging/hv/hyperv.h
+++ b/drivers/staging/hv/hyperv.h
@@ -846,7 +846,7 @@ static inline struct hv_driver *drv_to_hv_drv(struct device_driver *d)

/* Vmbus interface */
-int vmbus_child_driver_register(struct device_driver *drv);
+int vmbus_child_driver_register(struct hv_driver *hv_drv);
void vmbus_child_driver_unregister(struct device_driver *drv);

/*
diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c
index 94c5abc..a204ea7 100644
--- a/drivers/staging/hv/netvsc_drv.c
+++ b/drivers/staging/hv/netvsc_drv.c
@@ -452,7 +452,7 @@ static int __init netvsc_drv_init(void)
drv->driver.name = driver_name;

/* The driver belongs to vmbus */
- ret = vmbus_child_driver_register(&drv->driver);
+ ret = vmbus_child_driver_register(drv);

return ret;
}
diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
index ba27b51..149ef00 100644
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -1552,7 +1552,7 @@ static int __init storvsc_drv_init(void)

/* The driver belongs to vmbus */
- ret = vmbus_child_driver_register(&drv->driver);
+ ret = vmbus_child_driver_register(drv);

return ret;
}
diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c
index 29c1712..bd5a5a7 100644
--- a/drivers/staging/hv/vmbus_drv.c
+++ b/drivers/staging/hv/vmbus_drv.c
@@ -525,9 +525,10 @@ static int vmbus_bus_init(int irq)
*
* Mainly used by Hyper-V drivers.
*/
-int vmbus_child_driver_register(struct device_driver *drv)
+int vmbus_child_driver_register(struct hv_driver *hv_drv)
{
int ret;
+ struct device_driver *drv = &hv_drv->driver;

pr_info("child driver registering - name %s\n", drv->name);

--
1.7.4.1