summaryrefslogtreecommitdiff
path: root/drivers/staging/hv
diff options
context:
space:
mode:
authorK. Y. Srinivasan <kys@microsoft.com>2011-03-07 13:22:20 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2011-03-07 14:14:10 -0800
commit38fadc3e1f2ed55544acb75823ba7b2929597f68 (patch)
tree7aa293448074b5b108c7d17ff6e17d41b199e3fa /drivers/staging/hv
parent94851c343d1f98f866760c96a8956e30b07e579c (diff)
Staging: hv: Use generic device_driver shutdown function
In preparation for moving all the state from struct driver_context to struct hv_driver, eliminate the shutdown() function from struct driver_context and use generic device_driver shutdown() function. 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>
Diffstat (limited to 'drivers/staging/hv')
-rw-r--r--drivers/staging/hv/blkvsc_drv.c2
-rw-r--r--drivers/staging/hv/vmbus_drv.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
index 3e86a560074e..9ccd5dcc353a 100644
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -188,7 +188,7 @@ static int blkvsc_drv_init(int (*drv_init)(struct hv_driver *drv))
drv_ctx->driver.probe = blkvsc_probe;
drv_ctx->driver.remove = blkvsc_remove;
- drv_ctx->shutdown = blkvsc_shutdown;
+ drv_ctx->driver.shutdown = blkvsc_shutdown;
/* The driver belongs to vmbus */
ret = vmbus_child_driver_register(drv_ctx);
diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c
index 4df2be04fd14..6ef5bee65cac 100644
--- a/drivers/staging/hv/vmbus_drv.c
+++ b/drivers/staging/hv/vmbus_drv.c
@@ -1000,8 +1000,8 @@ static void vmbus_shutdown(struct device *child_device)
driver_ctx = driver_to_driver_context(child_device->driver);
/* Let the specific open-source driver handles the removal if it can */
- if (driver_ctx->shutdown)
- driver_ctx->shutdown(child_device);
+ if (driver_ctx->driver.shutdown)
+ driver_ctx->driver.shutdown(child_device);
return;
}