eal: remove deprecated function

The function rte_eal_pci_close_one() was renamed rte_eal_pci_detach().

Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com>
Acked-by: Stephen Hemminger <stephen@networkplumber.org>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Acked-by: David Marchand <david.marchand@6wind.com>

diff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst
index cf5cd1771a0522357d3070c8837fe7854e398be6..604a8992f4d05352c057ebb5a07675cc0d22eba2 100644 (file)
--- 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 825c61283cb1175b1188b1c3898bdbcac7fde46e..8a5b29a2a19396de2b9db68ece89f7f231a830de 100644 (file)
--- 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 2758848e2fcf5ea4f56c5096d8fcfeb9c64c8d5c..64fdfb1ecd8def8413a9ea1d9ffa5595ec50aff0 100644 (file)
--- 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 16e86297a3dd62945d1a4e06b9a0412ec289f514..dcfe9478a4c9282e3c57f033321c682859cd8271 100644 (file)
--- 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 3fb2d3a9e6cf831c64c46504ab35fca1ee194c03..83e3c28cac24936e90507b99fdf128e190f36cb4 100644 (file)
--- 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 59b1717940a16d79f5c9e7403b20db6d85382f1c..dbb8fa1582bd34062a89b95bf8f4a96dc6c5525b 100644 (file)
--- 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;