From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm0-f47.google.com (mail-wm0-f47.google.com [74.125.82.47]) by dpdk.org (Postfix) with ESMTP id 843CD5A7A for ; Fri, 8 Jul 2016 12:14:27 +0200 (CEST) Received: by mail-wm0-f47.google.com with SMTP id n127so9956670wme.1 for ; Fri, 08 Jul 2016 03:14:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=6wind-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=SX1b0l9/hPY0ElhEaCLQNiBb/fU4wpdiF39IpkAG2YY=; b=B6oGa2UoE/4JFuZ1DDEp+6uMDmodZbXLkcQMZUE+IdjtxkIi7UOwdQqZ1d6qK8BWHZ XsXRSbvyIElaSdtu01ZMCtihIEJm0x/NeLwoJ+nEfJeTu2uVwjjf5Lhk2JT8kw1GbKxM jIfudbkzZ9ZMdXS0/rH/wUFXsdZwGu+2B2rAyCjkZmqCXNVS3oEZhACrut5OU6FjADkT GlmQjxs08KBXeDHUfVlWU8VJULNeFyOjxNBaJ+rXreXDcZxzeqselIjbLhaQDBBSmYSn 3qxa27qQU0vK7uqip3kNV6804biz+Dfz7Dtpop5a1Rp62RhvBEXTmbJKsieZv9DbCbRB fsNw== 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=SX1b0l9/hPY0ElhEaCLQNiBb/fU4wpdiF39IpkAG2YY=; b=AH7qtXmbLG3Omkf13drrzZi7KMz1Nw2NwCqXd1VJy7SES+3g6PIImYX6qpz9W+60rl A3yeZ+wIzcoYqoatXczEnpISw2iai/NsQsMmd2Xy6lkzjpy0GLD5zVS/45JnBrBis/yY ZevgAaZE4E16Qz2ce7yXiE+aTIjliLLbJz7HWQ3kK7YGNnQp34N9cGXKeOKCrWatn8hb Q46JBltZZ6R8fW+o7UHv91phsFTXSaMbZEnkJ6aJYizxKJD+A/hDQUox6gmB096dbwZG CR2yNrQsBkD3wZDdJRzdZW/IZBHLWk3VwzU78+Dwt3p7kGUIWHVnVjWuURAQpyMJYRRH UaVg== X-Gm-Message-State: ALyK8tJ0TF91lLPglffQ9Sw0g+robWy31TSNghjuHzRRHykCyJEr4xb8yDpVlagPsV5n7E0V X-Received: by 10.28.87.3 with SMTP id l3mr979132wmb.71.1467972867018; Fri, 08 Jul 2016 03:14:27 -0700 (PDT) Received: from XPS13.localdomain (184.203.134.77.rev.sfr.net. [77.134.203.184]) by smtp.gmail.com with ESMTPSA id d4sm8146wjb.47.2016.07.08.03.14.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 08 Jul 2016 03:14:26 -0700 (PDT) From: Thomas Monjalon To: Neil Horman Cc: dev@dpdk.org Date: Fri, 8 Jul 2016 12:14:13 +0200 Message-Id: <1467972855-21873-9-git-send-email-thomas.monjalon@6wind.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1467972855-21873-1-git-send-email-thomas.monjalon@6wind.com> References: <1467905790-10597-1-git-send-email-thomas.monjalon@6wind.com> <1467972855-21873-1-git-send-email-thomas.monjalon@6wind.com> Subject: [dpdk-dev] [PATCH v2 08/10] eal: move PCI table macro 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: Fri, 08 Jul 2016 10:14:27 -0000 Remove include of rte_pci.h in the generic header rte_dev.h and move the macro DRIVER_REGISTER_PCI_TABLE in rte_pci.h. Fixes: cb6696d22023 ("drivers: update registration macro usage") Suggested-by: David Marchand Signed-off-by: Thomas Monjalon --- lib/librte_eal/common/include/rte_dev.h | 6 +----- lib/librte_eal/common/include/rte_pci.h | 5 +++++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/librte_eal/common/include/rte_dev.h b/lib/librte_eal/common/include/rte_dev.h index e6f0d4c..68ca7ef 100644 --- a/lib/librte_eal/common/include/rte_dev.h +++ b/lib/librte_eal/common/include/rte_dev.h @@ -48,7 +48,7 @@ extern "C" { #include #include -#include + #include __attribute__((format(printf, 2, 0))) @@ -195,10 +195,6 @@ DRIVER_EXPORT_NAME(nm, __COUNTER__) #define DRV_EXP_TAG(name, tag) __##name##_##tag -#define DRIVER_REGISTER_PCI_TABLE(name, table) \ -static const char DRV_EXP_TAG(name, pci_tbl_export)[] __attribute__((used)) = \ -RTE_STR(table) - #define DRIVER_REGISTER_PARAM_STRING(name, str) \ static const char DRV_EXP_TAG(name, param_string_export)[] \ __attribute__((used)) = str diff --git a/lib/librte_eal/common/include/rte_pci.h b/lib/librte_eal/common/include/rte_pci.h index fa74962..3b0d26a 100644 --- a/lib/librte_eal/common/include/rte_pci.h +++ b/lib/librte_eal/common/include/rte_pci.h @@ -188,6 +188,11 @@ struct rte_pci_device { .subsystem_device_id = PCI_ANY_ID #endif +#define DRIVER_REGISTER_PCI_TABLE(name, table) \ +static const char __##name##_pci_tbl_export[] \ + __attribute__((used)) = \ + RTE_STR(table) + struct rte_pci_driver; /** -- 2.7.0