From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f42.google.com (mail-pa0-f42.google.com [209.85.220.42]) by dpdk.org (Postfix) with ESMTP id DECAF8037 for ; Wed, 29 Oct 2014 09:41:53 +0100 (CET) Received: by mail-pa0-f42.google.com with SMTP id bj1so2760854pad.1 for ; Wed, 29 Oct 2014 01:50:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+xIK2XzZo5dGkkQE9LtGoiGlJl84rmcmYxFgGMCOK58=; b=m7drz/0zWmgu1fjJiSJRPnoj4jzSzszbcoWju2t83YLJxHkZAkAkbPcNyYoLcgWu3h xIHAKm1Avi42KANpU2KNcsJSjFUVC05jnweRTSLwm4whtBSCFTcHWZulUaiXevMYH9qt VfiwBjvlADtlISu/j+FPqxv3YDGV03InyITCyJL5Fjs58ME6HRqTfvBpDXgN6nPKcKpo zXhCnMWz8Zo/F47jJ+7osbTII41uJuWae2mO15v+wRQXFcu5bOaFJdj9xAiAOdeFCKoU MO8NvXi56J4X/GNsLbRVh3xddSoh3JGpXUGkPKc9GWCvddiKfi0tXju0wxZ7EvXG0LJV Ln8Q== X-Gm-Message-State: ALoCoQkJvEdCXyOkSiaQ/XggqpCIU8zfU4ybnoC3DivimGDE73Y0Q9pZddKkUHehRTMgXyXhRV0Q X-Received: by 10.70.38.109 with SMTP id f13mr9239734pdk.132.1414572644047; Wed, 29 Oct 2014 01:50:44 -0700 (PDT) Received: from eris.hq.igel.co.jp (napt.igel.co.jp. [219.106.231.132]) by mx.google.com with ESMTPSA id ky4sm3686872pbc.55.2014.10.29.01.50.42 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 29 Oct 2014 01:50:43 -0700 (PDT) From: Tetsuya Mukawa To: dev@dpdk.org Date: Wed, 29 Oct 2014 17:49:32 +0900 Message-Id: <1414572576-21371-22-git-send-email-mukawa@igel.co.jp> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1414572576-21371-1-git-send-email-mukawa@igel.co.jp> References: <1414572576-21371-1-git-send-email-mukawa@igel.co.jp> Cc: nakajima.yoshihiro@lab.ntt.co.jp, masutani.hitoshi@lab.ntt.co.jp Subject: [dpdk-dev] [RFC PATCH 21/25] eal/pci: Fix pci_probe_all_drivers to share code with closing function X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 29 Oct 2014 08:41:57 -0000 pci_close_all_drivers() will be implemented after the patch. To share a part of code between thses 2 functions, The patch fixes pci_probe_all_drivers() first. Signed-off-by: Tetsuya Mukawa --- lib/librte_eal/common/eal_common_pci.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c index f01f258..1e3efea 100644 --- a/lib/librte_eal/common/eal_common_pci.c +++ b/lib/librte_eal/common/eal_common_pci.c @@ -99,19 +99,20 @@ static struct rte_devargs *pci_devargs_lookup(struct rte_pci_device *dev) return NULL; } -/* - * If vendor/device ID match, call the devinit() function of all - * registered driver for the given device. Return -1 if initialization - * failed, return 1 if no driver is found for this device. - */ +#define INVOKE_PROBE (0) + static int -pci_probe_all_drivers(struct rte_pci_device *dev) +pci_invoke_all_drivers(struct rte_pci_device *dev, int type) { struct rte_pci_driver *dr = NULL; - int rc; + int rc = 0; TAILQ_FOREACH(dr, &pci_driver_list, next) { - rc = rte_eal_pci_probe_one_driver(dr, dev); + switch (type) { + case INVOKE_PROBE: + rc = rte_eal_pci_probe_one_driver(dr, dev); + break; + } if (rc < 0) /* negative value is an error */ return -1; @@ -124,6 +125,17 @@ pci_probe_all_drivers(struct rte_pci_device *dev) } /* + * If vendor/device ID match, call the devinit() function of all + * registered driver for the given device. Return -1 if initialization + * failed, return 1 if no driver is found for this device. + */ +static int +pci_probe_all_drivers(struct rte_pci_device *dev) +{ + return pci_invoke_all_drivers(dev, INVOKE_PROBE); +} + +/* * Scan the content of the PCI bus, and call the devinit() function for * all registered drivers that have a matching entry in its id_table * for discovered devices. -- 1.9.1