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>

diff --git a/drivers/staging/hv/vmbus.h b/drivers/staging/hv/vmbus.h
index a12e9e58d32f6cdfeda7d596d43156a53f9ac376..ecd2d2fb47b1dad96d7f8bfa235c67c341d0f6bb 100644 (file)
--- 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 60e40004e28f404525eb81abe668013c25043837..4c5a38e349b6b95d3c58919c4f9c968502dcdd21 100644 (file)
--- 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 36c4ec8c2f83f5385dffa051403f5eafc799ef16..0fcf377a24d451788b92c1b2702bde83093e8fd2 100644 (file)
--- 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 "