[PATCH v2 1/4] driver core: move deferred probe add / remove helpers down a bit
From: Luis R. Rodriguez <hidden>
Date: 2014-07-28 18:31:04
Also in:
linux-scsi, lkml
Subsystem:
driver core, kobjects, debugfs and sysfs, the rest · Maintainers:
Greg Kroah-Hartman, "Rafael J. Wysocki", Danilo Krummrich, Linus Torvalds
From: "Luis R. Rodriguez" <redacted> We need to do this if we want to use the trigger at a later point. This change has introduces no functional changes. Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Cc: Joseph Salisbury <redacted> Cc: One Thousand Gnomes <redacted> Cc: Tim Gardner <redacted> Cc: Pierre Fersing <redacted> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Oleg Nesterov <oleg@redhat.com> Cc: Benjamin Poirier <redacted> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Nagalakshmi Nandigama <redacted> Cc: Praveen Krishnamoorthy <redacted> Cc: Sreekanth Reddy <redacted> Cc: Abhijit Mahajan <redacted> Cc: Hariprasad S <redacted> Cc: Santosh Rastapur <redacted> Cc: MPT-FusionLinux.pdl@avagotech.com Cc: linux-scsi@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: netdev@vger.kernel.org Signed-off-by: Luis R. Rodriguez <redacted> --- drivers/base/dd.c | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/drivers/base/dd.c b/drivers/base/dd.c
index e4ffbcf..9947c2e 100644
--- a/drivers/base/dd.c
+++ b/drivers/base/dd.c@@ -109,26 +109,6 @@ static void deferred_probe_work_func(struct work_struct *work) } static DECLARE_WORK(deferred_probe_work, deferred_probe_work_func); -static void driver_deferred_probe_add(struct device *dev) -{ - mutex_lock(&deferred_probe_mutex); - if (list_empty(&dev->p->deferred_probe)) { - dev_dbg(dev, "Added to deferred list\n"); - list_add_tail(&dev->p->deferred_probe, &deferred_probe_pending_list); - } - mutex_unlock(&deferred_probe_mutex); -} - -void driver_deferred_probe_del(struct device *dev) -{ - mutex_lock(&deferred_probe_mutex); - if (!list_empty(&dev->p->deferred_probe)) { - dev_dbg(dev, "Removed from deferred list\n"); - list_del_init(&dev->p->deferred_probe); - } - mutex_unlock(&deferred_probe_mutex); -} - static bool driver_deferred_probe_enable = false; /** * driver_deferred_probe_trigger() - Kick off re-probing deferred devices
@@ -171,6 +151,26 @@ static void driver_deferred_probe_trigger(void) queue_work(deferred_wq, &deferred_probe_work); } +static void driver_deferred_probe_add(struct device *dev) +{ + mutex_lock(&deferred_probe_mutex); + if (list_empty(&dev->p->deferred_probe)) { + dev_dbg(dev, "Added to deferred list\n"); + list_add_tail(&dev->p->deferred_probe, &deferred_probe_pending_list); + } + mutex_unlock(&deferred_probe_mutex); +} + +void driver_deferred_probe_del(struct device *dev) +{ + mutex_lock(&deferred_probe_mutex); + if (!list_empty(&dev->p->deferred_probe)) { + dev_dbg(dev, "Removed from deferred list\n"); + list_del_init(&dev->p->deferred_probe); + } + mutex_unlock(&deferred_probe_mutex); +} + /** * deferred_probe_initcall() - Enable probing of deferred devices *
--
2.0.1