Staging: hv: Change the signature for vmbus_child_driver_unregister

In preperation for moving the element driver from the
struct driver_context to struct hv_driver, change the
signature for the function vmbus_child_driver_unregister()
to take a pointer to struct device_driver.

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

diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
index d5e18819c982733379ce8565f5ef97702a2fc853..dee38d5bd3b038204b59f39f8a896c5c7797b6cc 100644 (file)
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -233,7 +233,7 @@ static void blkvsc_drv_exit(void)
        if (storvsc_drv_obj->base.cleanup)
                storvsc_drv_obj->base.cleanup(&storvsc_drv_obj->base);
 
-       vmbus_child_driver_unregister(drv_ctx);
+       vmbus_child_driver_unregister(&drv_ctx->driver);
 
        return;
 }

diff --git a/drivers/staging/hv/hv_mouse.c b/drivers/staging/hv/hv_mouse.c
index d2290f8908ccfaeacc59ecb1706e4ffeb2cdd32b..4ab08ae9f48e8d3f7ee6b815d1f3e9de2fec3971 100644 (file)
--- a/drivers/staging/hv/hv_mouse.c
+++ b/drivers/staging/hv/hv_mouse.c
@@ -983,7 +983,7 @@ static void mousevsc_drv_exit(void)
        if (mousevsc_drv_obj->Base.cleanup)
                mousevsc_drv_obj->Base.cleanup(&mousevsc_drv_obj->Base);
 
-       vmbus_child_driver_unregister(drv_ctx);
+       vmbus_child_driver_unregister(&drv_ctx->driver);
 
        return;
 }

diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c
index a50a9a66558eae55581fe72a36e3c39b92de60af..333586ed99cb8672750fd23e11c6d62123ed9546 100644 (file)
--- a/drivers/staging/hv/netvsc_drv.c
+++ b/drivers/staging/hv/netvsc_drv.c
@@ -489,7 +489,7 @@ static void netvsc_drv_exit(void)
        if (netvsc_drv_obj->base.cleanup)
                netvsc_drv_obj->base.cleanup(&netvsc_drv_obj->base);
 
-       vmbus_child_driver_unregister(drv_ctx);
+       vmbus_child_driver_unregister(&drv_ctx->driver);
 
        return;
 }

diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c
index 8ab8df55f02ff4f080ddf00f24381a52d0cc6e22..ced611abff72c787299b84fe9b1ee3d69d96413e 100644 (file)
--- a/drivers/staging/hv/storvsc_drv.c
+++ b/drivers/staging/hv/storvsc_drv.c
@@ -209,7 +209,7 @@ static void storvsc_drv_exit(void)
        if (storvsc_drv_obj->base.cleanup)
                storvsc_drv_obj->base.cleanup(&storvsc_drv_obj->base);
 
-       vmbus_child_driver_unregister(drv_ctx);
+       vmbus_child_driver_unregister(&drv_ctx->driver);
        return;
 }
 

diff --git a/drivers/staging/hv/vmbus.h b/drivers/staging/hv/vmbus.h
index 2295fe2e86a19986b90189496ba8ef5adfcc9e70..7a5e70858b5f98300ea2a70f1ecdf12eb944a786 100644 (file)
--- a/drivers/staging/hv/vmbus.h
+++ b/drivers/staging/hv/vmbus.h
@@ -62,7 +62,7 @@ static inline struct driver_context *driver_to_driver_context(struct device_driv
 
 /* Vmbus interface */
 int vmbus_child_driver_register(struct device_driver *drv);
-void vmbus_child_driver_unregister(struct driver_context *driver_ctx);
+void vmbus_child_driver_unregister(struct device_driver *drv);
 
 extern struct completion hv_channel_ready;
 

diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c
index 685376b50d9f29c0c1a9be2b9f246d641f1cb008..1473809ad2854a44a98ac35759c3adcc122474e5 100644 (file)
--- a/drivers/staging/hv/vmbus_drv.c
+++ b/drivers/staging/hv/vmbus_drv.c
@@ -646,23 +646,22 @@ EXPORT_SYMBOL(vmbus_child_driver_register);
 
 /**
  * vmbus_child_driver_unregister() - Unregister a vmbus's child driver
- * @driver_ctx:        Pointer to driver structure you want to un-register
+ * @drv:        Pointer to driver structure you want to un-register
  *
- * @driver_ctx is of type &struct driver_context
  *
  * Un-register the given driver with Linux through the 'driver_unregister()'
  * call. And ungegisters the driver from the Hyper-V vmbus handler.
  *
  * Mainly used by Hyper-V drivers.
  */
-void vmbus_child_driver_unregister(struct driver_context *driver_ctx)
+void vmbus_child_driver_unregister(struct device_driver *drv)
 {
        DPRINT_INFO(VMBUS_DRV, "child driver (%p) unregistering - name %s",
-                   driver_ctx, driver_ctx->driver.name);
+                   drv, drv->name);
 
-       driver_unregister(&driver_ctx->driver);
+       driver_unregister(drv);
 
-       driver_ctx->driver.bus = NULL;
+       drv->bus = NULL;
 }
 EXPORT_SYMBOL(vmbus_child_driver_unregister);