From ad36d9e58a57d79e85575de1b3ebb85c8045472c Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 8 Mar 2012 12:20:37 -0800 Subject: [PATCH] --- yaml --- r: 288889 b: refs/heads/master c: 8b0372a258e6bd0e9e5ea3f3d5f05a6bf3972fee h: refs/heads/master i: 288887: b46875912973e581d4d44548ef2f5ac4c6a54534 v: v3 --- [refs] | 2 +- trunk/drivers/base/dd.c | 24 ++++++++++++++++-------- 2 files changed, 17 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index f489d20e82d0..a73c24a97c26 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ef8a3fd6e5e12e8989dae97ba5491c2e39369af9 +refs/heads/master: 8b0372a258e6bd0e9e5ea3f3d5f05a6bf3972fee diff --git a/trunk/drivers/base/dd.c b/trunk/drivers/base/dd.c index 9fa888e08059..1b1cbb571d38 100644 --- a/trunk/drivers/base/dd.c +++ b/trunk/drivers/base/dd.c @@ -80,8 +80,10 @@ static void deferred_probe_work_func(struct work_struct *work) get_device(dev); - /* Drop the mutex while probing each device; the probe path - * may manipulate the deferred list */ + /* + * Drop the mutex while probing each device; the probe path may + * manipulate the deferred list + */ mutex_unlock(&deferred_probe_mutex); dev_dbg(dev, "Retrying from deferred list\n"); bus_probe_device(dev); @@ -126,16 +128,20 @@ static void driver_deferred_probe_trigger(void) if (!driver_deferred_probe_enable) return; - /* A successful probe means that all the devices in the pending list + /* + * A successful probe means that all the devices in the pending list * should be triggered to be reprobed. Move all the deferred devices - * into the active list so they can be retried by the workqueue */ + * into the active list so they can be retried by the workqueue + */ mutex_lock(&deferred_probe_mutex); list_splice_tail_init(&deferred_probe_pending_list, &deferred_probe_active_list); mutex_unlock(&deferred_probe_mutex); - /* Kick the re-probe thread. It may already be scheduled, but - * it is safe to kick it again. */ + /* + * Kick the re-probe thread. It may already be scheduled, but it is + * safe to kick it again. + */ queue_work(deferred_wq, &deferred_probe_work); } @@ -171,8 +177,10 @@ static void driver_bound(struct device *dev) klist_add_tail(&dev->p->knode_driver, &dev->driver->p->klist_devices); - /* Make sure the device is no longer in one of the deferred lists - * and kick off retrying all pending devices */ + /* + * Make sure the device is no longer in one of the deferred lists and + * kick off retrying all pending devices + */ driver_deferred_probe_del(dev); driver_deferred_probe_trigger();