commit fde0ef9b235d8cb141e3aa35fdc7e9889e3a4cb3
author K. Y. Srinivasan <kys@microsoft.com> Thu May 12 19:35:08 2011 -0700
committer Greg Kroah-Hartman <gregkh@suse.de> Tue May 17 12:28:52 2011 -0700
tree 725412de81ac3b4d38817de329ebcdb589ab1702
parent 4e3cba6b4c34dd23a2e2487a26ffcecdf6bd3498

Staging: hv: netvsc_drv: Make netvsc_drv an instance of struct hv_driver

In preparation to getting rid of struct  netvsc_driver, make
the variable netvsc_drv an instance of struct hv_driver.

Signed-off-by: K. Y. Srinivasan <kys@microsoft.com>
Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com>
Signed-off-by: Abhishek Kane <v-abkane@microsoft.com>
Signed-off-by: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

drivers/staging/hv/netvsc_drv.c

diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c
index 950a456..d3b6148 100644
--- a/drivers/staging/hv/netvsc_drv.c
+++ b/drivers/staging/hv/netvsc_drv.c
@@ -428,26 +428,25 @@
 }
 
 /* The one and only one */
-static struct  netvsc_driver netvsc_drv = {
-	.base.probe = netvsc_probe,
-	.base.remove = netvsc_remove,
+static struct  hv_driver netvsc_drv = {
+	.probe = netvsc_probe,
+	.remove = netvsc_remove,
 };
 
 static void netvsc_drv_exit(void)
 {
-	vmbus_child_driver_unregister(&netvsc_drv.base.driver);
+	vmbus_child_driver_unregister(&netvsc_drv.driver);
 }
 
 static int netvsc_drv_init(int (*drv_init)(struct hv_driver *drv))
 {
-	struct netvsc_driver *net_drv_obj = &netvsc_drv;
-	struct hv_driver *drv = &netvsc_drv.base;
+	struct hv_driver *drv = &netvsc_drv;
 	int ret;
 
 	/* Callback to client driver to complete the initialization */
-	drv_init(&net_drv_obj->base);
+	drv_init(drv);
 
-	drv->driver.name = net_drv_obj->base.name;
+	drv->driver.name = drv->name;
 
 	/* The driver belongs to vmbus */
 	ret = vmbus_child_driver_register(&drv->driver);