From patchwork Tue Dec 9 03:42:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tetsuya Mukawa X-Patchwork-Id: 1851 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id EB78680B1; Tue, 9 Dec 2014 04:44:16 +0100 (CET) Received: from mail-pa0-f43.google.com (mail-pa0-f43.google.com [209.85.220.43]) by dpdk.org (Postfix) with ESMTP id E921680A7 for ; Tue, 9 Dec 2014 04:44:14 +0100 (CET) Received: by mail-pa0-f43.google.com with SMTP id kx10so6560514pab.30 for ; Mon, 08 Dec 2014 19:44:14 -0800 (PST) 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=gxyQ66gFaItpzCx7d8MUJfjxAVjL83E4IY7ooqRUwyQ=; b=WkzZk61rGM7FBfvSikCmIXvWBl/U7rqabNC8ufGwBKkYRt2vXWanvkxBv0b6uNyv9L SwyqTZNKJuxXgvvcKaQx2PxUcQkpUbpfqEuVFl+XWjtF3H+ZGFXwVGPtamC/+W9KldTv 2/eYkqH8azVqdHcf++LieT2vq85o2+hhf9lv8FO9B5Ut9fqzITflhj3R1TAx4YnddJJA cL42WrShG6bLxqZwv3jm9PF/qR9UCRuow94ooMTh/QAR/mC8QhYqNWEyGdLgofzBgRlW 7XHobj0SV4qHay0Ykftnyf0g6v1zko7OoBmWjh6ml8Zh3U7XhZPSYXJ6ZNs3w+XMa/fR zS5w== X-Gm-Message-State: ALoCoQmfbtXv4scDR6pqgjtBmVIHT23FtDC1CdVFYzzkDbFc3hRargN+sglanKLh+Xiuh/YY7co4 X-Received: by 10.67.15.106 with SMTP id fn10mr1168706pad.143.1418096654322; Mon, 08 Dec 2014 19:44:14 -0800 (PST) Received: from eris.hq.igel.co.jp (napt.igel.co.jp. [219.106.231.132]) by mx.google.com with ESMTPSA id xx2sm2185pab.17.2014.12.08.19.44.11 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 08 Dec 2014 19:44:13 -0800 (PST) From: Tetsuya Mukawa To: dev@dpdk.org Date: Tue, 9 Dec 2014 12:42:48 +0900 Message-Id: <1418096571-27531-26-git-send-email-mukawa@igel.co.jp> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1418096571-27531-1-git-send-email-mukawa@igel.co.jp> References: <1416474399-16851-1-git-send-email-mukawa@igel.co.jp> <1418096571-27531-1-git-send-email-mukawa@igel.co.jp> Cc: nakajima.yoshihiro@lab.ntt.co.jp, menrigh@brocade.com, masutani.hitoshi@lab.ntt.co.jp Subject: [dpdk-dev] [PATCH v2 25/28] eal/pci: Remove pci_probe/close_all_drivers() 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" These functions are actually wrappers of pci_invoke_all_drivers(). Just call it directly. Signed-off-by: Tetsuya Mukawa --- lib/librte_eal/common/eal_common_pci.c | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c index 5ff7b49..5044d8e 100644 --- a/lib/librte_eal/common/eal_common_pci.c +++ b/lib/librte_eal/common/eal_common_pci.c @@ -130,29 +130,7 @@ pci_invoke_all_drivers(struct rte_pci_device *dev, int type) return 1; } -/* - * 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); -} - #if defined(RTE_LIBRTE_EAL_HOTPLUG) && defined(RTE_LIBRTE_EAL_LINUXAPP) -/* - * If vendor/device ID match, call the devclose() 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_close_all_drivers(struct rte_pci_device *dev) -{ - return pci_invoke_all_drivers(dev, INVOKE_CLOSE); -} - static int rte_eal_pci_invoke_one(struct rte_pci_addr *addr, int type) { @@ -165,10 +143,10 @@ rte_eal_pci_invoke_one(struct rte_pci_addr *addr, int type) switch (type) { case INVOKE_PROBE: - ret = pci_probe_all_drivers(dev); + ret = pci_invoke_all_drivers(dev, INVOKE_PROBE); break; case INVOKE_CLOSE: - ret = pci_close_all_drivers(dev); + ret = pci_invoke_all_drivers(dev, INVOKE_CLOSE); break; } if (ret < 0) @@ -237,10 +215,10 @@ rte_eal_pci_probe(void) /* probe all or only whitelisted devices */ if (probe_all) - ret = pci_probe_all_drivers(dev); + ret = pci_invoke_all_drivers(dev, INVOKE_PROBE); else if (devargs != NULL && devargs->type == RTE_DEVTYPE_WHITELISTED_PCI) - ret = pci_probe_all_drivers(dev); + ret = pci_invoke_all_drivers(dev, INVOKE_PROBE); if (ret < 0) rte_exit(EXIT_FAILURE, "Requested device " PCI_PRI_FMT " cannot be used\n", dev->addr.domain, dev->addr.bus,