Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Staging: hv: Remove probe_error from vm_device

Browse source 
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>
This commit is contained in:
K. Y. Srinivasan 2011-03-07 13:34:48 -08:00 • committed by Greg Kroah-Hartman
parent a3c7fe9a33
commit 70b0af4f52
3 changed files with 4 additions and 3 deletions

1
drivers/staging/hv/vmbus.h
View file

@ -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;
};

2
drivers/staging/hv/vmbus_api.h
View file

@ -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;

4
drivers/staging/hv/vmbus_drv.c
View file

@ -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 "