diff options
author | K. Y. Srinivasan <kys@microsoft.com> | 2011-03-07 21:34:48 (GMT) |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-07 22:20:24 (GMT) |
commit | 70b0af4f52b3da6aeac2bd03221217beff4746a1 (patch) | |
tree | d5eaf4bb558d8f44462d0742bf7a81ada83cf396 /drivers/staging/hv | |
parent | a3c7fe9a333516a14b34cf57684e864ecd2145ce (diff) | |
download | linux-fsl-qoriq-70b0af4f52b3da6aeac2bd03221217beff4746a1.tar.xz |
Staging: hv: Remove probe_error from vm_device
In preparation for consolidating all device related state into
struct hv_device, move probe_error from vm_device to
hv_device.
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/vmbus.h | 1 | ||||
-rw-r--r-- | drivers/staging/hv/vmbus_api.h | 2 | ||||
-rw-r--r-- | drivers/staging/hv/vmbus_drv.c | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/drivers/staging/hv/vmbus.h b/drivers/staging/hv/vmbus.h index a12e9e5..ecd2d2f 100644 --- a/drivers/staging/hv/vmbus.h +++ b/drivers/staging/hv/vmbus.h @@ -32,7 +32,6 @@ struct vm_device { struct hv_guid class_id; struct hv_guid device_id; - int probe_error; struct hv_device device_obj; struct device device; }; diff --git a/drivers/staging/hv/vmbus_api.h b/drivers/staging/hv/vmbus_api.h index 60e4000..4c5a38e 100644 --- a/drivers/staging/hv/vmbus_api.h +++ b/drivers/staging/hv/vmbus_api.h @@ -120,6 +120,8 @@ struct hv_device { struct work_struct probe_failed_work_item; + int probe_error; + /* the device type id of this device */ struct hv_guid dev_type; diff --git a/drivers/staging/hv/vmbus_drv.c b/drivers/staging/hv/vmbus_drv.c index 36c4ec8..0fcf377 100644 --- a/drivers/staging/hv/vmbus_drv.c +++ b/drivers/staging/hv/vmbus_drv.c @@ -742,7 +742,7 @@ int vmbus_child_device_register(struct hv_device *root_device_obj, ret = device_register(&child_device_ctx->device); /* vmbus_probe() error does not get propergate to device_register(). */ - ret = child_device_ctx->probe_error; + ret = child_device_ctx->device_obj.probe_error; if (ret) DPRINT_ERR(VMBUS_DRV, "unable to register child device (%p)", @@ -908,7 +908,7 @@ static int vmbus_probe(struct device *child_device) /* Let the specific open-source driver handles the probe if it can */ if (drv->driver.probe) { - ret = device_ctx->probe_error = + ret = device_ctx->device_obj.probe_error = drv->driver.probe(child_device); if (ret != 0) { DPRINT_ERR(VMBUS_DRV, "probe() failed for device %s " |