diff options
| author | K. Y. Srinivasan <kys@microsoft.com> | 2011-03-07 13:20:57 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-07 14:09:17 -0800 |
| commit | 904777c784eed64f6138b82da592c89bf0d37b9c (patch) | |
| tree | d711579e5551fbd9bc7d6d00a852a1bc264a2980 /drivers/staging/hv | |
| parent | d542f180cd40a571a218e11b640dec27a3f627d0 (diff) | |
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>
Diffstat (limited to 'drivers/staging/hv')
| -rw-r--r-- | drivers/staging/hv/blkvsc_drv.c | 2 | ||||
| -rw-r--r-- | drivers/staging/hv/hv_mouse.c | 2 | ||||
| -rw-r--r-- | drivers/staging/hv/netvsc_drv.c | 2 | ||||
| -rw-r--r-- | drivers/staging/hv/storvsc_drv.c | 2 | ||||
| -rw-r--r-- | drivers/staging/hv/vmbus_drv.c | 5 |
5 files changed, 7 insertions, 6 deletions
diff --git a/drivers/staging/hv/blkvsc_drv.c b/drivers/staging/hv/blkvsc_drv.c index 36a0adbaa987..0dff55791d26 100644 --- 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 --git a/drivers/staging/hv/hv_mouse.c b/drivers/staging/hv/hv_mouse.c index 1aaaef4695e3..4a25f3b8770d 100644 --- a/drivers/staging/hv/hv_mouse.c +++ b/drivers/staging/hv/hv_mouse.c @@ -1021,7 +1021,7 @@ static int __init mousevsc_init(void) memcpy(&drv_ctx->class_id, &input_drv_obj->Base.dev_type, sizeof(struct hv_guid)); - drv_ctx->probe = mousevsc_probe; + drv_ctx->driver.probe = mousevsc_probe; drv_ctx->remove = mousevsc_remove; /* The driver belongs to vmbus */ diff --git a/drivers/staging/hv/netvsc_drv.c b/drivers/staging/hv/netvsc_drv.c index 03f97404a2de..083f0d348598 100644 --- a/drivers/staging/hv/netvsc_drv.c +++ b/drivers/staging/hv/netvsc_drv.c @@ -511,7 +511,7 @@ static int netvsc_drv_init(int (*drv_init)(struct hv_driver *drv)) memcpy(&drv_ctx->class_id, &net_drv_obj->base.dev_type, sizeof(struct hv_guid)); - drv_ctx->probe = netvsc_probe; + drv_ctx->driver.probe = netvsc_probe; drv_ctx->remove = netvsc_remove; /* The driver belongs to vmbus */ diff --git a/drivers/staging/hv/storvsc_drv.c b/drivers/staging/hv/storvsc_drv.c index a8427ffd162b..3fe4bdb4ec92 100644 --- a/drivers/staging/hv/storvsc_drv.c +++ b/drivers/staging/hv/storvsc_drv.c @@ -164,7 +164,7 @@ static int storvsc_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 = storvsc_probe; + drv_ctx->driver.probe = storvsc_probe; drv_ctx->remove = storvsc_remove; /* The driver belongs to vmbus */ diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c index 459c707afe57..fee2a8f9b4e4 100644 --- a/drivers/staging/hv/vmbus_drv.c +++ b/drivers/staging/hv/vmbus_drv.c @@ -919,8 +919,9 @@ static int vmbus_probe(struct device *child_device) device_to_vm_device(child_device); /* Let the specific open-source driver handles the probe if it can */ - if (driver_ctx->probe) { - ret = device_ctx->probe_error = driver_ctx->probe(child_device); + if (driver_ctx->driver.probe) { + ret = device_ctx->probe_error = + driver_ctx->driver.probe(child_device); if (ret != 0) { DPRINT_ERR(VMBUS_DRV, "probe() failed for device %s " "(%p) on driver %s (%d)...", |