From patchwork Fri Oct 7 13:33:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shreyansh Jain X-Patchwork-Id: 16438 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 AF3905686; Fri, 7 Oct 2016 15:32:22 +0200 (CEST) Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on0041.outbound.protection.outlook.com [104.47.42.41]) by dpdk.org (Postfix) with ESMTP id 89D615595 for ; Fri, 7 Oct 2016 15:32:20 +0200 (CEST) Received: from BN6PR03CA0011.namprd03.prod.outlook.com (10.168.230.149) by CY4PR03MB2613.namprd03.prod.outlook.com (10.173.42.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.649.16; Fri, 7 Oct 2016 13:32:19 +0000 Received: from BL2FFO11OLC016.protection.gbl (2a01:111:f400:7c09::140) by BN6PR03CA0011.outlook.office365.com (2603:10b6:404:23::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.659.11 via Frontend Transport; Fri, 7 Oct 2016 13:32:18 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; nxp.com; dmarc=fail action=none header.from=nxp.com; nxp.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BL2FFO11OLC016.mail.protection.outlook.com (10.173.160.82) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.629.5 via Frontend Transport; Fri, 7 Oct 2016 13:32:18 +0000 Received: from Tophie.ap.freescale.net ([10.232.14.87]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u97DWFF1028443; Fri, 7 Oct 2016 06:32:16 -0700 From: Shreyansh Jain To: CC: , , Shreyansh Jain Date: Fri, 7 Oct 2016 19:03:05 +0530 Message-ID: <1475847187-28967-1-git-send-email-shreyansh.jain@nxp.com> X-Mailer: git-send-email 2.7.4 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131203207389066205; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(586003)(81166006)(7846002)(8666005)(33646002)(8676002)(6666003)(305945005)(97736004)(86362001)(356003)(50986999)(2906002)(575784001)(4326007)(87936001)(85426001)(81156014)(189998001)(106466001)(47776003)(110136003)(50226002)(36756003)(626004)(11100500001)(8936002)(68736007)(19580405001)(5003940100001)(229853001)(92566002)(19580395003)(48376002)(50466002)(105606002)(6916009)(2351001)(77096005)(104016004)(5660300001)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR03MB2613; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11OLC016; 1:q0V8B/OiGx5iWBDTuenRjFsGpVfUz6+wam8fiIerQTbwW+9UnJ6h06yMWaH9gXPxi9X1EHXAssxdQKFDBSGiaq2o5kxnLdhWatHip+uPxX7jEacIng13Hm1WtvDZ3iWgSFO28PqpM6pzx/CoW1oWn0SQuv2j1zsbm+mB+GiguDhRw3V8Sdl3Pa5uUv/gF9/XkTDHEjPBs7Gsj4cqWTp6+ndsBl5+NGxYBSleTU0hWzU6ZOIonoyxsrbvQpWtXv6tlw5KiTJYQ6iHrEpbEPDHnVTmtfzNKNZ3SyZKN/ZPsg9YpDuZ4dlNnRAxDsrlr2xbJX5EKxOLZ9N+iFGczZVnXyqr/E1S5SbI9IB6TyHi14ArsBLW/lN1Ds16/yVlfUW6C57anL0GXJf3x7/5Giyu8si064MqPRli3OuTC96UX4AQ2AhP8SOWNiiIzc+yueEUBVVG9q5VlrApI/RdA2fQRGX1s1r0nX2AV2CHRDIsFkKlnXO3X4JuM2z3rHA6LScAuG2KElw8vm4eeWdYSpf2LHOcYgNywqq7HuBTKlU7dMK2ToPYVLmltu76dRtxAzRsBjGgRNWLWZoWx2AutyJG7GFJ635Q3O/YjMAKnJGLRt+JnZXUj6rDOgDW3LNGKLa+9G0tfq+RycU12TxCAjztcejr9EVF0ShVMRUvTxyoqciX6fIOASCl1QOQbyVPLdD+qN4y9CvobGzwta8RcwmnOXuJfky+V2MYeG/iJ594s9g= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 9ac9c821-7c80-4142-d281-08d3eeb65c45 X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2613; 2:JILajLwWslwfqCapk/ECH+2QGbuuD86GoKEFaUzoNy58RKjHH0YTUYBt92lFoXhPsEQpqRll/HzL9Cpcl8U53S/UXHQcQNHvlRrw/cmlqf0RU9sON0hUm/SE3t9Ptr/B2NB35EtInH+kOq5eQueHMEgEzJNaB1tXiL36DNWsTsrLEuDskIOjwETf1FfJY1JfyVTgKUITu47A/DQWd7Xp9A==; 3:P7V3A1NSvJSBG8gPDtS6VSvYBtuOIiapr6gJDmWfitsNfjZ/JrPsr3pdYYhpKFTeQKjG96ybhVr0ltdXTqkbNscSagMwxf47HKcg1Yq4nRa8qkkXMRRvOvFe5rN3zIbh8lhwHY4GaK+SZnayBr/0pQeenAwxDgvc5mnXbcEnYbmMTG6/MblstjC4+CESmH59SosNv5SNOBoIjwO85wstmpqHwLgRpBcVJtjmjw2lLP+z5+JMhf2qKUuMmLRdxJy0; 25:Ra0pqYUoxO2R1CIf1iPR4Rye/XvZmodCHvjAwKnHhV0TrqeGtSu/rFS2K7nGqBC57qn5GO1Wb4gZOuMjQ71YhIzJz5KWILoT0ImgrrAOigX3r2p1MLxd+SFpYSx5+i0sfc8ABWbCTYSPaVmUF7++SsT8Z438zk/50BH19SfcG8L82040c2ZB+JzabQp5qmoogRb62qYJPVyovN2aewQUCaYWEVPEF4BszKFS5rfK4F/cr0eXq0wdkPAVW5Fe6y/LsiT3Kmy3iUspLUjM6dqkpKHKL5K/1MwhOPmg56o0ai3FJkjAvTBOSe/M26yXUH5+qCPGKbz2oiXsZSkbjr1YldhgDpvPJff6Kw49gV6Kdv25wgtLHNtSHByZ3Grx7Dlzo7Sy3lILssB0W80lAc2TeAtHF6YOrhlvTCsNXqOF5kRRywhPmtp5fqkXTXGh0bT6 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY4PR03MB2613; X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2613; 31:YdVVWCKghTROL07MyqsQeBfYJVYcB0kLgoGWUobmHd9UFLIvjcHb5DMnk4Cee3RmAYngSO+SHrvhFjiY1icQsGjHfaejNdVdef10AjlPnGRIDy2wvvFpcdtC9TevEDOTHuNzZ0bJN9WmIScc5FM8FSpc64ZrjeRqhE5TSG9atQmUGwWOgx8GFKfgV7XoMSAvBgbzT9fORPgo1teBlROh9yKis0RefMP4HPmP5p4idBGGRwRKaTIqTfwx+vXIL3oD; 4:diPAT9QfKZM1mVX6Sp8gznAFz6YP1MDf0NL3RV1mY3E8rBbHnmbrroKdl829wGTgblv/0uzn+IXptyJ4yu3PDXZYda7ht9jORaUUFj/WWzYe7DtRX7TAMSVtbkc0LG2JIaP0nK8Ypv5/yVPze7eaZ8biB5IQvgIFeej9c6gsvsYihpZ8COdstOH9eOL0Hp/pJ97uJ8tlz9tOYyseHaPill65prQMbiPaPpLt8kmpGVRQq1uKSv5AsR39wFvduJZMy+Y37iJ9DurqRlFL/ob5o0qiEEpR28v5yL9eFTHENjel+y3SQVJLT1dDyzjQyHV6z8U/xpPaUiqoPQOgJ+9u6Uxla+19W5fCLPxKX+EAiiGSjdU3AE7tBhqfBxBWzn4FqB6JXpUqfZwcWY/x422uPlagjkAWIB5fFyFPkfd4izWELzcqkVDdLRfNGl2hg5b2Lap6QbDHMBQG2jg/3JFFyGk++kYb30k6Ne3otFgmS6mJqB2VvhZ8TowKWmJAioXcnnQWaOjZvSiZadtpSAJxtSTWN+H+oOtd6G61BZag/yEmrAcFPBvynAuyOh94Swtp X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(5005006)(13018025)(13024025)(13015025)(13017025)(13023025)(8121501046)(10201501046)(3002001)(6055026); SRVR:CY4PR03MB2613; BCL:0; PCL:0; RULEID:(400006); SRVR:CY4PR03MB2613; X-Forefront-PRVS: 0088C92887 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR03MB2613; 23:6HZNdTUtGrc8tfhHISSQFBbHiCTNoIOTIXm/j9Gww?= =?us-ascii?Q?BWH0g/JT1nspewEhFLhPrckFzg+tAm3HS4mdkYsM50QEEWi2nnGfbk0/bmX9?= =?us-ascii?Q?2Oi1qZXezR0UlSR3DvZMKzeNN/I54EqdStxeKT4neA0FVlTPVGX7NBf88Fm5?= =?us-ascii?Q?7UL3xMm6ZauzrUwvdCGuV562ItRcWTjCw5VC2eyZkPQMlp7YWMpl1vpfKfXS?= =?us-ascii?Q?mDqfzhVoL5yV2NYWbufoDUZt62XQi21aEL0oZVcvXzTwc29aWx27Mo5h2oML?= =?us-ascii?Q?5ydV3S63bB3SekGxvjf0VKCXTK+kz6x9+h9waUFIQKfL0ts8iLv2Cg9+nX6m?= =?us-ascii?Q?X6cOD1YsmhmOF3G1P2jeHoPxmfsqp0MIyoY6kjoqKyI5+mpMrF/w/uRhi/H2?= =?us-ascii?Q?fnlYuR8KXKSR02KdJpRAzQFt1ZVtQcfI9lJki6pRMzP9c8992Tj+0dOlq/F4?= =?us-ascii?Q?iiWfrcLWyA0NUgrepILp5BcmBtlYzkHlZqZ3JwnmG+Z6cgLt5A+gRrij4XDc?= =?us-ascii?Q?lij0zfASQhOuOKY00vy91QsLVwCDtxIV8NEdn6XKfPxIzRGqlpmfH1FdpdTa?= =?us-ascii?Q?/i9XPLxySSW0Gsqc1/5THE9C31L5xr3AXguTKcf0LBDc29dBek+xPRVyBBsC?= =?us-ascii?Q?OeJUfZvhuq3Aeh8Mm/QB7HSeHBxo9RK6PFbFjy5En3CUISMRUJN6O7TNVFzd?= =?us-ascii?Q?n1ROcOiIVvqW0m1bVPPdNOjckqgjrMfXwy4eMbuOm3MB0YDiUuVk2MXb4wxI?= =?us-ascii?Q?48RXnncXQpDkovlkTWaMKBqAPjfAwHUNA3aDJxPlJwdJ1pKQ5PgdbL0Gir5W?= =?us-ascii?Q?Hy/dY6aS7flm+E0uYXhewBdE0LHjEvFUp/JYOfMhs9hK5OMBfNzOvtYUTl5w?= =?us-ascii?Q?gA1qEr/0sZzsS1WEWFIsq0KmWcynxmBqxtcRNQg8g8L7OaaFKGC/0TMQIjo5?= =?us-ascii?Q?4C3t+6WHX3Iem50NwPVGLkQFbO5vF49L0rC909DG3DJd/qQ07OzsCFCud/TA?= =?us-ascii?Q?ssQPYLbrAFV0qAJ+/drYwf/wJh4sSayZ53c2k7Au3NBAzRpWCf85ZRhn2chV?= =?us-ascii?Q?+RX15c6Ur0sBYy8VtctFURM4hDxYWB+UWaH07rqZfCqYz+t1/rcx7VQt7WFn?= =?us-ascii?Q?G2Pr6bGfTuHvb9KPS+m4HlCjrT3EIE4EItWyDE54LBQuzM9WYXEwOB1w2w8f?= =?us-ascii?Q?GxMjWV7dA8+9M8=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB2613; 6:QKDiH8/f+Nnzx1wk+MQCzEaYuI9FPHfhJtcwUZ0ED5uh1aZHL8Xn8JKbdCEgqSFpYyL4ZEX8HQ1KmKRAngVqT/IYzkseN7HGN9NVdjEXBhqIRBdI2KMIkVYna14ZbHaarDBvheAzv/FiyWYeCfQYEyjY8QUrPQEaewEQFcq6do4Z8HIchoLnuptQ++rpQKtclVH5c9yZ5bhJKuXto80PkaAzPiKZctuv6UsFyfhbjWG6GYcWo7tIPpHCYGt/Uzy0tTF7uAX8cXhfZAEKzy9F5+2pOFomeqTaKC6lhS8Qjafw8oJvR6aTVjl4LbGMljD2; 5:0hDi6qdU8qb6eBRlvuFVH6+u4i8+BX047+IOK0fJyb82+dmzwVvGPFhktmOCjkNasGY+JtMyz2VZmFMuKonxwju2DTYV+8tGoZg+PmPvoKnlbCsGT7nWNWPgQ8WxMy+TIK1r0DGQyp3ULOvCAtgfjSy44iH8rqMPdFdIF2txPfn1BekJ2EIfbbcSOTOJgCYS; 24:i/8lY6SHn93G2v7jq7YjxKVbWY18kiBC9xXHNZpPHUl/bMA9kXX3TdJPcP8ukq3wSTW20xH4kmTsL6IAUxftcCtY+3Clx3MIXEbxZvA8VDw=; 7:NvxqbmDA3s/OGCrJGsDA7/YU1RBs6snYPYFrcYDCU8orXt/TYSq1zIcIUu+0BCmtI0CFrjafR+kdf0kw7BjY68RhR0IOWak3ohcHmZDtzqOfbwTwjlyaxK4uTnPFBqQchB8frhwscrX9Pg6g1D37PDMJXJP3dfBVNUp1fMS15lkl0q559+ZXYGJ0hKe/V4qCX2x6t8mSAKR34queHH+MeE7Vdulzf4YxJAmq+1cvTUXjuDi9M4alv0QCBYKyO54B5J3Vx7rXHcVF3QipJW4HxrOgp557IcQQYMy0V0S8Slk3qAS5SdjbN8ZEmWbDnMq9jPhWhnXnruLEC6dWGoid4w== SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Oct 2016 13:32:18.7194 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR03MB2613 Subject: [dpdk-dev] [PATCH 1/3] eal/drivers: prefix driver REGISTER macros with EAL 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" DRIVER_REGISTER_PCI -> EAL_REGISTER_PCI DRIVER_REGISTER_PCI_TABLE -> EAL_REGISTER_PCI_TABLE Signed-off-by: Shreyansh Jain --- doc/guides/prog_guide/dev_kit_build_system.rst | 2 +- drivers/crypto/qat/rte_qat_cryptodev.c | 4 ++-- drivers/net/bnx2x/bnx2x_ethdev.c | 8 ++++---- drivers/net/bnxt/bnxt_ethdev.c | 4 ++-- drivers/net/cxgbe/cxgbe_ethdev.c | 4 ++-- drivers/net/e1000/em_ethdev.c | 4 ++-- drivers/net/e1000/igb_ethdev.c | 8 ++++---- drivers/net/ena/ena_ethdev.c | 4 ++-- drivers/net/enic/enic_ethdev.c | 4 ++-- drivers/net/fm10k/fm10k_ethdev.c | 4 ++-- drivers/net/i40e/i40e_ethdev.c | 4 ++-- drivers/net/i40e/i40e_ethdev_vf.c | 4 ++-- drivers/net/ixgbe/ixgbe_ethdev.c | 8 ++++---- drivers/net/mlx4/mlx4.c | 2 +- drivers/net/mlx5/mlx5.c | 2 +- drivers/net/nfp/nfp_net.c | 4 ++-- drivers/net/qede/qede_ethdev.c | 8 ++++---- drivers/net/szedata2/rte_eth_szedata2.c | 4 ++-- drivers/net/thunderx/nicvf_ethdev.c | 4 ++-- drivers/net/virtio/virtio_ethdev.c | 2 +- drivers/net/vmxnet3/vmxnet3_ethdev.c | 4 ++-- lib/librte_eal/common/include/rte_dev.h | 2 +- lib/librte_eal/common/include/rte_pci.h | 2 +- 23 files changed, 48 insertions(+), 48 deletions(-) diff --git a/doc/guides/prog_guide/dev_kit_build_system.rst b/doc/guides/prog_guide/dev_kit_build_system.rst index 05358d0..d6120cd 100644 --- a/doc/guides/prog_guide/dev_kit_build_system.rst +++ b/doc/guides/prog_guide/dev_kit_build_system.rst @@ -264,7 +264,7 @@ instance the macro: .. code-block:: c - DRIVER_REGISTER_PCI(name, drv) + EAL_REGISTER_PCI(name, drv) Creates the following symbol: diff --git a/drivers/crypto/qat/rte_qat_cryptodev.c b/drivers/crypto/qat/rte_qat_cryptodev.c index 170ae78..2cd2fff 100644 --- a/drivers/crypto/qat/rte_qat_cryptodev.c +++ b/drivers/crypto/qat/rte_qat_cryptodev.c @@ -123,6 +123,6 @@ static struct rte_cryptodev_driver rte_qat_pmd = { .dev_private_size = sizeof(struct qat_pmd_private), }; -DRIVER_REGISTER_PCI(CRYPTODEV_NAME_QAT_SYM_PMD, rte_qat_pmd.pci_drv); -DRIVER_REGISTER_PCI_TABLE(CRYPTODEV_NAME_QAT_SYM_PMD, pci_id_qat_map); +EAL_REGISTER_PCI(CRYPTODEV_NAME_QAT_SYM_PMD, rte_qat_pmd.pci_drv); +EAL_REGISTER_PCI_TABLE(CRYPTODEV_NAME_QAT_SYM_PMD, pci_id_qat_map); diff --git a/drivers/net/bnx2x/bnx2x_ethdev.c b/drivers/net/bnx2x/bnx2x_ethdev.c index e38c238..ad874bd 100644 --- a/drivers/net/bnx2x/bnx2x_ethdev.c +++ b/drivers/net/bnx2x/bnx2x_ethdev.c @@ -641,7 +641,7 @@ static struct eth_driver rte_bnx2xvf_pmd = { .dev_private_size = sizeof(struct bnx2x_softc), }; -DRIVER_REGISTER_PCI(net_bnx2x, rte_bnx2x_pmd.pci_drv); -DRIVER_REGISTER_PCI_TABLE(net_bnx2x, pci_id_bnx2x_map); -DRIVER_REGISTER_PCI(net_bnx2xvf, rte_bnx2xvf_pmd.pci_drv); -DRIVER_REGISTER_PCI_TABLE(net_bnx2xvf, pci_id_bnx2xvf_map); +EAL_REGISTER_PCI(net_bnx2x, rte_bnx2x_pmd.pci_drv); +EAL_REGISTER_PCI_TABLE(net_bnx2x, pci_id_bnx2x_map); +EAL_REGISTER_PCI(net_bnx2xvf, rte_bnx2xvf_pmd.pci_drv); +EAL_REGISTER_PCI_TABLE(net_bnx2xvf, pci_id_bnx2xvf_map); diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 427aa69..6713f8e 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -1121,5 +1121,5 @@ static struct eth_driver bnxt_rte_pmd = { .dev_private_size = sizeof(struct bnxt), }; -DRIVER_REGISTER_PCI(net_bnxt, bnxt_rte_pmd.pci_drv); -DRIVER_REGISTER_PCI_TABLE(net_bnxt, bnxt_pci_id_map); +EAL_REGISTER_PCI(net_bnxt, bnxt_rte_pmd.pci_drv); +EAL_REGISTER_PCI_TABLE(net_bnxt, bnxt_pci_id_map); diff --git a/drivers/net/cxgbe/cxgbe_ethdev.c b/drivers/net/cxgbe/cxgbe_ethdev.c index d3ff94a..2f7ff66 100644 --- a/drivers/net/cxgbe/cxgbe_ethdev.c +++ b/drivers/net/cxgbe/cxgbe_ethdev.c @@ -1048,5 +1048,5 @@ static struct eth_driver rte_cxgbe_pmd = { .dev_private_size = sizeof(struct port_info), }; -DRIVER_REGISTER_PCI(net_cxgbe, rte_cxgbe_pmd.pci_drv); -DRIVER_REGISTER_PCI_TABLE(net_cxgbe, cxgb4_pci_tbl); +EAL_REGISTER_PCI(net_cxgbe, rte_cxgbe_pmd.pci_drv); +EAL_REGISTER_PCI_TABLE(net_cxgbe, cxgb4_pci_tbl); diff --git a/drivers/net/e1000/em_ethdev.c b/drivers/net/e1000/em_ethdev.c index f767e1c..d9b19c0 100644 --- a/drivers/net/e1000/em_ethdev.c +++ b/drivers/net/e1000/em_ethdev.c @@ -1793,5 +1793,5 @@ eth_em_set_mc_addr_list(struct rte_eth_dev *dev, return 0; } -DRIVER_REGISTER_PCI(net_e1000_em, rte_em_pmd.pci_drv); -DRIVER_REGISTER_PCI_TABLE(net_e1000_em, pci_id_em_map); +EAL_REGISTER_PCI(net_e1000_em, rte_em_pmd.pci_drv); +EAL_REGISTER_PCI_TABLE(net_e1000_em, pci_id_em_map); diff --git a/drivers/net/e1000/igb_ethdev.c b/drivers/net/e1000/igb_ethdev.c index 5a1a83e..5cc9d77 100644 --- a/drivers/net/e1000/igb_ethdev.c +++ b/drivers/net/e1000/igb_ethdev.c @@ -5226,7 +5226,7 @@ eth_igb_configure_msix_intr(struct rte_eth_dev *dev) E1000_WRITE_FLUSH(hw); } -DRIVER_REGISTER_PCI(net_e1000_igb, rte_igb_pmd.pci_drv); -DRIVER_REGISTER_PCI_TABLE(net_e1000_igb, pci_id_igb_map); -DRIVER_REGISTER_PCI(net_e1000_igb_vf, rte_igbvf_pmd.pci_drv); -DRIVER_REGISTER_PCI_TABLE(net_e1000_igb_vf, pci_id_igbvf_map); +EAL_REGISTER_PCI(net_e1000_igb, rte_igb_pmd.pci_drv); +EAL_REGISTER_PCI_TABLE(net_e1000_igb, pci_id_igb_map); +EAL_REGISTER_PCI(net_e1000_igb_vf, rte_igbvf_pmd.pci_drv); +EAL_REGISTER_PCI_TABLE(net_e1000_igb_vf, pci_id_igbvf_map); diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c index 6efd801..ec11d2d 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -1695,5 +1695,5 @@ static struct eth_driver rte_ena_pmd = { .dev_private_size = sizeof(struct ena_adapter), }; -DRIVER_REGISTER_PCI(net_ena, rte_ena_pmd.pci_drv); -DRIVER_REGISTER_PCI_TABLE(net_ena, pci_id_ena_map); +EAL_REGISTER_PCI(net_ena, rte_ena_pmd.pci_drv); +EAL_REGISTER_PCI_TABLE(net_ena, pci_id_ena_map); diff --git a/drivers/net/enic/enic_ethdev.c b/drivers/net/enic/enic_ethdev.c index 82dc265..419ea88 100644 --- a/drivers/net/enic/enic_ethdev.c +++ b/drivers/net/enic/enic_ethdev.c @@ -643,5 +643,5 @@ static struct eth_driver rte_enic_pmd = { .dev_private_size = sizeof(struct enic), }; -DRIVER_REGISTER_PCI(net_enic, rte_enic_pmd.pci_drv); -DRIVER_REGISTER_PCI_TABLE(net_enic, pci_id_enic_map); +EAL_REGISTER_PCI(net_enic, rte_enic_pmd.pci_drv); +EAL_REGISTER_PCI_TABLE(net_enic, pci_id_enic_map); diff --git a/drivers/net/fm10k/fm10k_ethdev.c b/drivers/net/fm10k/fm10k_ethdev.c index 372564b..76acd0e 100644 --- a/drivers/net/fm10k/fm10k_ethdev.c +++ b/drivers/net/fm10k/fm10k_ethdev.c @@ -3071,5 +3071,5 @@ static struct eth_driver rte_pmd_fm10k = { .dev_private_size = sizeof(struct fm10k_adapter), }; -DRIVER_REGISTER_PCI(net_fm10k, rte_pmd_fm10k.pci_drv); -DRIVER_REGISTER_PCI_TABLE(net_fm10k, pci_id_fm10k_map); +EAL_REGISTER_PCI(net_fm10k, rte_pmd_fm10k.pci_drv); +EAL_REGISTER_PCI_TABLE(net_fm10k, pci_id_fm10k_map); diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c index 697800e..3481223 100644 --- a/drivers/net/i40e/i40e_ethdev.c +++ b/drivers/net/i40e/i40e_ethdev.c @@ -702,8 +702,8 @@ rte_i40e_dev_atomic_write_link_status(struct rte_eth_dev *dev, return 0; } -DRIVER_REGISTER_PCI(net_i40e, rte_i40e_pmd.pci_drv); -DRIVER_REGISTER_PCI_TABLE(net_i40e, pci_id_i40e_map); +EAL_REGISTER_PCI(net_i40e, rte_i40e_pmd.pci_drv); +EAL_REGISTER_PCI_TABLE(net_i40e, pci_id_i40e_map); #ifndef I40E_GLQF_ORT #define I40E_GLQF_ORT(_i) (0x00268900 + ((_i) * 4)) diff --git a/drivers/net/i40e/i40e_ethdev_vf.c b/drivers/net/i40e/i40e_ethdev_vf.c index 34eb274..3e059a9 100644 --- a/drivers/net/i40e/i40e_ethdev_vf.c +++ b/drivers/net/i40e/i40e_ethdev_vf.c @@ -1564,8 +1564,8 @@ static struct eth_driver rte_i40evf_pmd = { .dev_private_size = sizeof(struct i40e_adapter), }; -DRIVER_REGISTER_PCI(net_i40e_vf, rte_i40evf_pmd.pci_drv); -DRIVER_REGISTER_PCI_TABLE(net_i40e_vf, pci_id_i40evf_map); +EAL_REGISTER_PCI(net_i40e_vf, rte_i40evf_pmd.pci_drv); +EAL_REGISTER_PCI_TABLE(net_i40e_vf, pci_id_i40evf_map); static int i40evf_dev_configure(struct rte_eth_dev *dev) diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c b/drivers/net/ixgbe/ixgbe_ethdev.c index 6b3d4fa..891bef0 100644 --- a/drivers/net/ixgbe/ixgbe_ethdev.c +++ b/drivers/net/ixgbe/ixgbe_ethdev.c @@ -7348,7 +7348,7 @@ ixgbevf_dev_interrupt_handler(__rte_unused struct rte_intr_handle *handle, ixgbevf_dev_interrupt_action(dev); } -DRIVER_REGISTER_PCI(net_ixgbe, rte_ixgbe_pmd.pci_drv); -DRIVER_REGISTER_PCI_TABLE(net_ixgbe, pci_id_ixgbe_map); -DRIVER_REGISTER_PCI(net_ixgbe_vf, rte_ixgbevf_pmd.pci_drv); -DRIVER_REGISTER_PCI_TABLE(net_ixgbe_vf, pci_id_ixgbevf_map); +EAL_REGISTER_PCI(net_ixgbe, rte_ixgbe_pmd.pci_drv); +EAL_REGISTER_PCI_TABLE(net_ixgbe, pci_id_ixgbe_map); +EAL_REGISTER_PCI(net_ixgbe_vf, rte_ixgbevf_pmd.pci_drv); +EAL_REGISTER_PCI_TABLE(net_ixgbe_vf, pci_id_ixgbevf_map); diff --git a/drivers/net/mlx4/mlx4.c b/drivers/net/mlx4/mlx4.c index 1553b2e..d2a342d 100644 --- a/drivers/net/mlx4/mlx4.c +++ b/drivers/net/mlx4/mlx4.c @@ -5941,4 +5941,4 @@ rte_mlx4_pmd_init(void) } DRIVER_EXPORT_NAME(net_mlx4, __COUNTER__); -DRIVER_REGISTER_PCI_TABLE(net_mlx4, mlx4_pci_id_map); +EAL_REGISTER_PCI_TABLE(net_mlx4, mlx4_pci_id_map); diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c index 758df6e..41b5013 100644 --- a/drivers/net/mlx5/mlx5.c +++ b/drivers/net/mlx5/mlx5.c @@ -757,4 +757,4 @@ rte_mlx5_pmd_init(void) } DRIVER_EXPORT_NAME(net_mlx5, __COUNTER__); -DRIVER_REGISTER_PCI_TABLE(net_mlx5, mlx5_pci_id_map); +EAL_REGISTER_PCI_TABLE(net_mlx5, mlx5_pci_id_map); diff --git a/drivers/net/nfp/nfp_net.c b/drivers/net/nfp/nfp_net.c index d526f34..28617c7 100644 --- a/drivers/net/nfp/nfp_net.c +++ b/drivers/net/nfp/nfp_net.c @@ -2479,8 +2479,8 @@ static struct eth_driver rte_nfp_net_pmd = { .dev_private_size = sizeof(struct nfp_net_adapter), }; -DRIVER_REGISTER_PCI(net_nfp, rte_nfp_net_pmd.pci_drv); -DRIVER_REGISTER_PCI_TABLE(net_nfp, pci_id_nfp_net_map); +EAL_REGISTER_PCI(net_nfp, rte_nfp_net_pmd.pci_drv); +EAL_REGISTER_PCI_TABLE(net_nfp, pci_id_nfp_net_map); /* * Local variables: diff --git a/drivers/net/qede/qede_ethdev.c b/drivers/net/qede/qede_ethdev.c index d00c1d9..c46756d 100644 --- a/drivers/net/qede/qede_ethdev.c +++ b/drivers/net/qede/qede_ethdev.c @@ -1502,7 +1502,7 @@ static struct eth_driver rte_qede_pmd = { .dev_private_size = sizeof(struct qede_dev), }; -DRIVER_REGISTER_PCI(net_qede, rte_qede_pmd.pci_drv); -DRIVER_REGISTER_PCI_TABLE(net_qede, pci_id_qede_map); -DRIVER_REGISTER_PCI(net_qede_vf, rte_qedevf_pmd.pci_drv); -DRIVER_REGISTER_PCI_TABLE(net_qede_vf, pci_id_qedevf_map); +EAL_REGISTER_PCI(net_qede, rte_qede_pmd.pci_drv); +EAL_REGISTER_PCI_TABLE(net_qede, pci_id_qede_map); +EAL_REGISTER_PCI(net_qede_vf, rte_qedevf_pmd.pci_drv); +EAL_REGISTER_PCI_TABLE(net_qede_vf, pci_id_qedevf_map); diff --git a/drivers/net/szedata2/rte_eth_szedata2.c b/drivers/net/szedata2/rte_eth_szedata2.c index f4ec5ea..7e9d8b7 100644 --- a/drivers/net/szedata2/rte_eth_szedata2.c +++ b/drivers/net/szedata2/rte_eth_szedata2.c @@ -1581,5 +1581,5 @@ static struct eth_driver szedata2_eth_driver = { .dev_private_size = sizeof(struct pmd_internals), }; -DRIVER_REGISTER_PCI(RTE_SZEDATA2_DRIVER_NAME, szedata2_eth_driver.pci_drv); -DRIVER_REGISTER_PCI_TABLE(RTE_SZEDATA2_DRIVER_NAME, rte_szedata2_pci_id_table); +EAL_REGISTER_PCI(RTE_SZEDATA2_DRIVER_NAME, szedata2_eth_driver.pci_drv); +EAL_REGISTER_PCI_TABLE(RTE_SZEDATA2_DRIVER_NAME, rte_szedata2_pci_id_table); diff --git a/drivers/net/thunderx/nicvf_ethdev.c b/drivers/net/thunderx/nicvf_ethdev.c index b758c9f..2dc32e2 100644 --- a/drivers/net/thunderx/nicvf_ethdev.c +++ b/drivers/net/thunderx/nicvf_ethdev.c @@ -1780,5 +1780,5 @@ static struct eth_driver rte_nicvf_pmd = { .dev_private_size = sizeof(struct nicvf), }; -DRIVER_REGISTER_PCI(net_thunderx, rte_nicvf_pmd.pci_drv); -DRIVER_REGISTER_PCI_TABLE(net_thunderx, pci_id_nicvf_map); +EAL_REGISTER_PCI(net_thunderx, rte_nicvf_pmd.pci_drv); +EAL_REGISTER_PCI_TABLE(net_thunderx, pci_id_nicvf_map); diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index b4dfc0a..003290c 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -1558,4 +1558,4 @@ __rte_unused uint8_t is_rx) } DRIVER_EXPORT_NAME(net_virtio, __COUNTER__); -DRIVER_REGISTER_PCI_TABLE(net_virtio, pci_id_virtio_map); +EAL_REGISTER_PCI_TABLE(net_virtio, pci_id_virtio_map); diff --git a/drivers/net/vmxnet3/vmxnet3_ethdev.c b/drivers/net/vmxnet3/vmxnet3_ethdev.c index 51e2d4c..3f41d6a 100644 --- a/drivers/net/vmxnet3/vmxnet3_ethdev.c +++ b/drivers/net/vmxnet3/vmxnet3_ethdev.c @@ -960,5 +960,5 @@ vmxnet3_process_events(struct vmxnet3_hw *hw) } #endif -DRIVER_REGISTER_PCI(net_vmxnet3, rte_vmxnet3_pmd.pci_drv); -DRIVER_REGISTER_PCI_TABLE(net_vmxnet3, pci_id_vmxnet3_map); +EAL_REGISTER_PCI(net_vmxnet3, rte_vmxnet3_pmd.pci_drv); +EAL_REGISTER_PCI_TABLE(net_vmxnet3, pci_id_vmxnet3_map); diff --git a/lib/librte_eal/common/include/rte_dev.h b/lib/librte_eal/common/include/rte_dev.h index d159991..3801a2d 100644 --- a/lib/librte_eal/common/include/rte_dev.h +++ b/lib/librte_eal/common/include/rte_dev.h @@ -230,7 +230,7 @@ __attribute__((used)) = RTE_STR(name) #define DRV_EXP_TAG(name, tag) __##name##_##tag -#define DRIVER_REGISTER_PCI_TABLE(name, table) \ +#define EAL_REGISTER_PCI_TABLE(name, table) \ static const char DRV_EXP_TAG(name, pci_tbl_export)[] __attribute__((used)) = \ RTE_STR(table) diff --git a/lib/librte_eal/common/include/rte_pci.h b/lib/librte_eal/common/include/rte_pci.h index 3a8e8c8..df273f8 100644 --- a/lib/librte_eal/common/include/rte_pci.h +++ b/lib/librte_eal/common/include/rte_pci.h @@ -487,7 +487,7 @@ void rte_eal_pci_dump(FILE *f); void rte_eal_pci_register(struct rte_pci_driver *driver); /** Helper for PCI device registration from driver (eth, crypto) instance */ -#define DRIVER_REGISTER_PCI(nm, pci_drv) \ +#define EAL_REGISTER_PCI(nm, pci_drv) \ RTE_INIT(pciinitfn_ ##nm); \ static void pciinitfn_ ##nm(void) \ {\