lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Staging: hv: Use generic device_driver probe function

Browse Source 
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>
This commit is contained in:
K. Y. Srinivasan
2011-03-07 13:20:57 -08:00
committed by Greg Kroah-Hartman
parent d542f180cd
commit 904777c784
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/staging/hv/blkvsc_drv.c
View File

@@ -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, memcpy(&drv_ctx->class_id, &storvsc_drv_obj->base.dev_type,
sizeof(struct hv_guid)); sizeof(struct hv_guid));
drv_ctx->probe = blkvsc_probe; drv_ctx->driver.probe = blkvsc_probe;
drv_ctx->remove = blkvsc_remove; drv_ctx->remove = blkvsc_remove;
drv_ctx->shutdown = blkvsc_shutdown; drv_ctx->shutdown = blkvsc_shutdown;

2
drivers/staging/hv/hv_mouse.c
View File

@@ -1021,7 +1021,7 @@ static int __init mousevsc_init(void)
memcpy(&drv_ctx->class_id, &input_drv_obj->Base.dev_type, memcpy(&drv_ctx->class_id, &input_drv_obj->Base.dev_type,
sizeof(struct hv_guid)); sizeof(struct hv_guid));
drv_ctx->probe = mousevsc_probe; drv_ctx->driver.probe = mousevsc_probe;
drv_ctx->remove = mousevsc_remove; drv_ctx->remove = mousevsc_remove;
/* The driver belongs to vmbus */ /* The driver belongs to vmbus */

2
drivers/staging/hv/netvsc_drv.c
View File

@@ -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, memcpy(&drv_ctx->class_id, &net_drv_obj->base.dev_type,
sizeof(struct hv_guid)); sizeof(struct hv_guid));
drv_ctx->probe = netvsc_probe; drv_ctx->driver.probe = netvsc_probe;
drv_ctx->remove = netvsc_remove; drv_ctx->remove = netvsc_remove;
/* The driver belongs to vmbus */ /* The driver belongs to vmbus */

2
drivers/staging/hv/storvsc_drv.c
View File

@@ -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, memcpy(&drv_ctx->class_id, &storvsc_drv_obj->base.dev_type,
sizeof(struct hv_guid)); sizeof(struct hv_guid));
drv_ctx->probe = storvsc_probe; drv_ctx->driver.probe = storvsc_probe;
drv_ctx->remove = storvsc_remove; drv_ctx->remove = storvsc_remove;
/* The driver belongs to vmbus */ /* The driver belongs to vmbus */

5
drivers/staging/hv/vmbus_drv.c
View File

@@ -919,8 +919,9 @@ static int vmbus_probe(struct device *child_device)
device_to_vm_device(child_device); device_to_vm_device(child_device);
/* Let the specific open-source driver handles the probe if it can */ /* Let the specific open-source driver handles the probe if it can */
if (driver_ctx->probe) { if (driver_ctx->driver.probe) {
ret = device_ctx->probe_error = driver_ctx->probe(child_device); ret = device_ctx->probe_error =
driver_ctx->driver.probe(child_device);
if (ret != 0) { if (ret != 0) {
DPRINT_ERR(VMBUS_DRV, "probe() failed for device %s " DPRINT_ERR(VMBUS_DRV, "probe() failed for device %s "
"(%p) on driver %s (%d)...", "(%p) on driver %s (%d)...",