Skip to content

Commit

Permalink
Staging: hv: Use generic device_driver remove function
Browse files Browse the repository at this point in the history
In preparation for moving all the state from struct driver_context
to struct hv_driver, eliminate the remove() function from
struct driver_context and use generic device_driver remove()
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>
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed Mar 7, 2011
1 parent 904777c commit 94851c3
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion drivers/staging/hv/blkvsc_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ static int blkvsc_drv_init(int (*drv_init)(struct hv_driver *drv))
sizeof(struct hv_guid));

drv_ctx->driver.probe = blkvsc_probe;
drv_ctx->remove = blkvsc_remove;
drv_ctx->driver.remove = blkvsc_remove;
drv_ctx->shutdown = blkvsc_shutdown;

/* The driver belongs to vmbus */
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/hv/hv_mouse.c
Original file line number Diff line number Diff line change
Expand Up @@ -1022,7 +1022,7 @@ static int __init mousevsc_init(void)
sizeof(struct hv_guid));

drv_ctx->driver.probe = mousevsc_probe;
drv_ctx->remove = mousevsc_remove;
drv_ctx->driver.remove = mousevsc_remove;

/* The driver belongs to vmbus */
vmbus_child_driver_register(drv_ctx);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/hv/netvsc_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ static int netvsc_drv_init(int (*drv_init)(struct hv_driver *drv))
sizeof(struct hv_guid));

drv_ctx->driver.probe = netvsc_probe;
drv_ctx->remove = netvsc_remove;
drv_ctx->driver.remove = netvsc_remove;

/* The driver belongs to vmbus */
ret = vmbus_child_driver_register(drv_ctx);
Expand Down
2 changes: 1 addition & 1 deletion drivers/staging/hv/storvsc_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ static int storvsc_drv_init(int (*drv_init)(struct hv_driver *drv))
sizeof(struct hv_guid));

drv_ctx->driver.probe = storvsc_probe;
drv_ctx->remove = storvsc_remove;
drv_ctx->driver.remove = storvsc_remove;

/* The driver belongs to vmbus */
ret = vmbus_child_driver_register(drv_ctx);
Expand Down
4 changes: 2 additions & 2 deletions drivers/staging/hv/vmbus_drv.c
Original file line number Diff line number Diff line change
Expand Up @@ -964,8 +964,8 @@ static int vmbus_remove(struct device *child_device)
* Let the specific open-source driver handles the removal if
* it can
*/
if (driver_ctx->remove) {
ret = driver_ctx->remove(child_device);
if (driver_ctx->driver.remove) {
ret = driver_ctx->driver.remove(child_device);
} else {
DPRINT_ERR(VMBUS_DRV,
"remove() method not set for driver - %s",
Expand Down

0 comments on commit 94851c3

Please sign in to comment.