Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752145AbaG1SbE (ORCPT ); Mon, 28 Jul 2014 14:31:04 -0400 Received: from mail-pd0-f178.google.com ([209.85.192.178]:36392 "EHLO mail-pd0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751496AbaG1S2l (ORCPT ); Mon, 28 Jul 2014 14:28:41 -0400 From: "Luis R. Rodriguez" To: gregkh@linuxfoundation.org Cc: tiwai@suse.de, linux-kernel@vger.kernel.org, "Luis R. Rodriguez" , Tetsuo Handa , Joseph Salisbury , One Thousand Gnomes , Tim Gardner , Pierre Fersing , Andrew Morton , Oleg Nesterov , Benjamin Poirier , Nagalakshmi Nandigama , Praveen Krishnamoorthy , Sreekanth Reddy , Abhijit Mahajan , Hariprasad S , Santosh Rastapur , MPT-FusionLinux.pdl@avagotech.com, linux-scsi@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH v2 1/4] driver core: move deferred probe add / remove helpers down a bit Date: Mon, 28 Jul 2014 11:28:27 -0700 Message-Id: <1406572110-26823-2-git-send-email-mcgrof@do-not-panic.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1406572110-26823-1-git-send-email-mcgrof@do-not-panic.com> References: <1406572110-26823-1-git-send-email-mcgrof@do-not-panic.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: "Luis R. Rodriguez" 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 Cc: Joseph Salisbury Cc: One Thousand Gnomes Cc: Tim Gardner Cc: Pierre Fersing Cc: Andrew Morton Cc: Oleg Nesterov Cc: Benjamin Poirier Cc: Greg Kroah-Hartman Cc: Nagalakshmi Nandigama Cc: Praveen Krishnamoorthy Cc: Sreekanth Reddy Cc: Abhijit Mahajan Cc: Hariprasad S Cc: Santosh Rastapur 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 --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/