From e32bbdb218ed7cf133d06acac2ee407601ca31a0 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Tue, 1 Sep 2015 14:58:16 +0200 Subject: [PATCH] eal: remove deprecated function The function rte_eal_pci_close_one() was renamed rte_eal_pci_detach(). Signed-off-by: Thomas Monjalon Acked-by: Stephen Hemminger Acked-by: Neil Horman Acked-by: David Marchand --- doc/guides/rel_notes/deprecation.rst | 3 --- doc/guides/rel_notes/release_2_2.rst | 3 +++ lib/librte_eal/bsdapp/eal/rte_eal_version.map | 1 - lib/librte_eal/common/eal_common_pci.c | 6 ------ lib/librte_eal/common/include/rte_pci.h | 2 -- lib/librte_eal/linuxapp/eal/rte_eal_version.map | 1 - 6 files changed, 3 insertions(+), 13 deletions(-) diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst index cf5cd1771a..604a8992f4 100644 --- a/doc/guides/rel_notes/deprecation.rst +++ b/doc/guides/rel_notes/deprecation.rst @@ -13,9 +13,6 @@ Deprecation Notices There is no backward compatibility planned from release 2.2. All binaries will need to be rebuilt from release 2.2. -* The EAL function rte_eal_pci_close_one is deprecated because renamed to - rte_eal_pci_detach. - * The Macros RTE_HASH_BUCKET_ENTRIES_MAX and RTE_HASH_KEY_LENGTH_MAX are deprecated and will be removed with version 2.2. diff --git a/doc/guides/rel_notes/release_2_2.rst b/doc/guides/rel_notes/release_2_2.rst index 825c61283c..8a5b29a2a1 100644 --- a/doc/guides/rel_notes/release_2_2.rst +++ b/doc/guides/rel_notes/release_2_2.rst @@ -16,6 +16,9 @@ Known Issues API Changes ----------- +* The function rte_eal_pci_close_one() is removed. + It was replaced by rte_eal_pci_detach(). + ABI Changes ----------- diff --git a/lib/librte_eal/bsdapp/eal/rte_eal_version.map b/lib/librte_eal/bsdapp/eal/rte_eal_version.map index 2758848e2f..64fdfb1ecd 100644 --- a/lib/librte_eal/bsdapp/eal/rte_eal_version.map +++ b/lib/librte_eal/bsdapp/eal/rte_eal_version.map @@ -40,7 +40,6 @@ DPDK_2.0 { rte_eal_mp_remote_launch; rte_eal_mp_wait_lcore; rte_eal_parse_devargs_str; - rte_eal_pci_close_one; rte_eal_pci_dump; rte_eal_pci_probe; rte_eal_pci_probe_one; diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c index 16e86297a3..dcfe9478a4 100644 --- a/lib/librte_eal/common/eal_common_pci.c +++ b/lib/librte_eal/common/eal_common_pci.c @@ -348,12 +348,6 @@ err_return: return -1; } -int __attribute__ ((deprecated)) -rte_eal_pci_close_one(const struct rte_pci_addr *addr) -{ - return rte_eal_pci_detach(addr); -} - /* * Detach device specified by its pci address. */ diff --git a/lib/librte_eal/common/include/rte_pci.h b/lib/librte_eal/common/include/rte_pci.h index 3fb2d3a9e6..83e3c28cac 100644 --- a/lib/librte_eal/common/include/rte_pci.h +++ b/lib/librte_eal/common/include/rte_pci.h @@ -426,8 +426,6 @@ int rte_eal_pci_probe_one(const struct rte_pci_addr *addr); * - Negative on error. */ int rte_eal_pci_detach(const struct rte_pci_addr *addr); -int __attribute__ ((deprecated)) -rte_eal_pci_close_one(const struct rte_pci_addr *addr); /** * Dump the content of the PCI bus. diff --git a/lib/librte_eal/linuxapp/eal/rte_eal_version.map b/lib/librte_eal/linuxapp/eal/rte_eal_version.map index 59b1717940..dbb8fa1582 100644 --- a/lib/librte_eal/linuxapp/eal/rte_eal_version.map +++ b/lib/librte_eal/linuxapp/eal/rte_eal_version.map @@ -40,7 +40,6 @@ DPDK_2.0 { rte_eal_mp_remote_launch; rte_eal_mp_wait_lcore; rte_eal_parse_devargs_str; - rte_eal_pci_close_one; rte_eal_pci_dump; rte_eal_pci_probe; rte_eal_pci_probe_one; -- 2.20.1