Skip to content

Commit

Permalink
Staging: hv: Remove probe_error from vm_device
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
K. Y. Srinivasan authored and Greg Kroah-Hartman committed Mar 7, 2011
1 parent a3c7fe9 commit 70b0af4
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
1 change: 0 additions & 1 deletion drivers/staging/hv/vmbus.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Expand Down
2 changes: 2 additions & 0 deletions drivers/staging/hv/vmbus_api.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

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 @@ -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)",
Expand Down Expand Up @@ -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 "
Expand Down

0 comments on commit 70b0af4

Please sign in to comment.