From b14a7b3014b1151597d526f2e24f291ebc3a4f5b Mon Sep 17 00:00:00 2001 From: "K. Y. Srinivasan" Date: Fri, 29 Apr 2011 13:45:03 -0700 Subject: [PATCH] Staging: hv: Cleanup vmbus_probe() function The logic for handling probe failure was broken. Now that we have cleaned up error handling, get rid of the vmbus_probe_failed_cb() function. Signed-off-by: K. Y. Srinivasan Signed-off-by: Haiyang Zhang Signed-off-by: Abhishek Kane Signed-off-by: Hank Janssen Signed-off-by: Greg Kroah-Hartman --- drivers/staging/hv/vmbus_api.h | 4 ---- drivers/staging/hv/vmbus_drv.c | 31 ++----------------------------- 2 files changed, 2 insertions(+), 33 deletions(-) diff --git a/drivers/staging/hv/vmbus_api.h b/drivers/staging/hv/vmbus_api.h index 02e35874c1c3..14df762b05d6 100644 --- a/drivers/staging/hv/vmbus_api.h +++ b/drivers/staging/hv/vmbus_api.h @@ -105,10 +105,6 @@ struct hv_driver { struct hv_device { char name[64]; - 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 1183459f394e..5f88249ece8e 100644 --- a/drivers/staging/hv/vmbus_drv.c +++ b/drivers/staging/hv/vmbus_drv.c @@ -313,27 +313,6 @@ static int vmbus_match(struct device *device, struct device_driver *driver) return match; } - -/* - * vmbus_probe_failed_cb - Callback when a driver probe failed in vmbus_probe() - * - * We need a callback because we cannot invoked device_unregister() inside - * vmbus_probe() since vmbus_probe() may be invoked inside device_register() - * i.e. we cannot call device_unregister() inside device_register() - */ -static void vmbus_probe_failed_cb(struct work_struct *context) -{ - struct hv_device *device_ctx = (struct hv_device *)context; - - /* - * Kick off the process of unregistering the device. - * This will call vmbus_remove() and eventually vmbus_device_release() - */ - device_unregister(&device_ctx->device); - - /* put_device(&device_ctx->device); */ -} - /* * vmbus_probe - Add the new vmbus's child device */ @@ -342,20 +321,14 @@ static int vmbus_probe(struct device *child_device) int ret = 0; struct hv_driver *drv = drv_to_hv_drv(child_device->driver); - struct hv_device *dev = device_to_hv_device(child_device); /* Let the specific open-source driver handles the probe if it can */ if (drv->driver.probe) { - ret = dev->probe_error = - drv->driver.probe(child_device); - if (ret != 0) { + ret = drv->driver.probe(child_device); + if (ret != 0) pr_err("probe failed for device %s (%d)\n", dev_name(child_device), ret); - INIT_WORK(&dev->probe_failed_work_item, - vmbus_probe_failed_cb); - schedule_work(&dev->probe_failed_work_item); - } } else { pr_err("probe not set for driver %s\n", dev_name(child_device));