Staging: hv: Use generic device_driver probe function

In preparation for moving all the state from struct driver_context
to struct hv_driver, eliminate the probe() function from
struct driver_context and use generic device_driver probe
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>

diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c
index 36a0adb..0dff557 100644 (file)
--- a/drivers/staging/hv/blkvsc_drv.c
+++ b/drivers/staging/hv/blkvsc_drv.c
@@ -186,7 +186,7 @@ static int blkvsc_drv_init(int (*drv_init)(struct hv_driver *drv))
        memcpy(&drv_ctx->class_id, &storvsc_drv_obj->base.dev_type,
               sizeof(struct hv_guid));
 
-       drv_ctx->probe = blkvsc_probe;
+       drv_ctx->driver.probe = blkvsc_probe;
        drv_ctx->remove = blkvsc_remove;
        drv_ctx->shutdown = blkvsc_shutdown;
 

diff --cc drivers/staging/hv/hv_mouse.c
Simple merge

diff --cc drivers/staging/hv/netvsc_drv.c
Simple merge

diff --cc drivers/staging/hv/storvsc_drv.c
Simple merge

diff --cc drivers/staging/hv/vmbus_drv.c
Simple merge