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 1B8764CE6 for ; Thu, 7 Jul 2016 17:36:43 +0200 (CEST) Received: by mail-wm0-f47.google.com with SMTP id f126so215571167wma.1 for ; Thu, 07 Jul 2016 08:36:43 -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=5fAfr8k6GMlqZA/T4KgJ2YRM5TQEvTaB1gnCMTmeCJA=; b=TZiZ7gbbHuDayeKA+uQzB/jax9ivbWRN4XJjSp8MXX2us9BJSvm2zYY8qJ4M+RABqC FOJUuwkoqXFTSvlz+AwVgDV72AIyMNbuT8XLt4icFpqNnjysivfvff6ugRgFYj6g6lKE ZwpCS+A2AC2yiLUok84qULBaExK1ucpazlTpJe0FhnUvNXIyMzk9wGYNxQ0jYudWKFZJ DaNIHP0/jyff023N+Ufp0xGifUe5DfE9328oqoAtyM2rHfXGKl2DM9bIYW/u462LN4YN w3YgGROdJInanQM0PBBaJVkmUa/+HLfpt/bgfizav/QUEsMzig6m+SCATLMj4RLvCT0r ovGw== 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=5fAfr8k6GMlqZA/T4KgJ2YRM5TQEvTaB1gnCMTmeCJA=; b=AzYTxmCvbWsM16z7cY4JRkMeuxLjVJ0GU1nda0tIYTa3Y30eZc7WBLm73qD7P+kWuU BdpPYe0j59SJeXhZVlRL8WKNOHZO4SxlSFU/oH1zPLkfK4R5C6Ks1U5RahB0mWQVbp2G 4KpysEX6FZoh+Y0ByqqlHxdWGXieCKQTmX/B7TYeBRx6LwTAS08XjBhpKsyaIdfembiX LGjJcpAyfahlwhshKuTRJTLADP4bdKXuhvogOOkFxATwMPiIFzkhENMvcPl7dRkl0ryx sbe4zjqOPZ8lGz3SLFdE6UfQgE9v/8TmpN0GBU2UVebyRuCd/Pz6avGBGUaNz6Eb+W99 4xnQ== X-Gm-Message-State: ALyK8tLxNueBI9PFkyybIfaySGZwYmOY/+pTxRH6F0ORgYH5MjY4ZFQGzKbYbkGJC1WHk5/J X-Received: by 10.194.95.74 with SMTP id di10mr813646wjb.52.1467905802912; Thu, 07 Jul 2016 08:36:42 -0700 (PDT) Received: from XPS13.localdomain (184.203.134.77.rev.sfr.net. [77.134.203.184]) by smtp.gmail.com with ESMTPSA id p126sm559331wmp.13.2016.07.07.08.36.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Jul 2016 08:36:42 -0700 (PDT) From: Thomas Monjalon To: Neil Horman Cc: dev@dpdk.org Date: Thu, 7 Jul 2016 17:36:28 +0200 Message-Id: <1467905790-10597-10-git-send-email-thomas.monjalon@6wind.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1467905790-10597-1-git-send-email-thomas.monjalon@6wind.com> References: <1467905790-10597-1-git-send-email-thomas.monjalon@6wind.com> Subject: [dpdk-dev] [PATCH 09/11] 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: Thu, 07 Jul 2016 15:36:43 -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") 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