eal: remove deprecated function

[dpdk.git] / lib / librte_eal / common / eal_common_pci.c

diff --git a/lib/librte_eal/common/eal_common_pci.c b/lib/librte_eal/common/eal_common_pci.c
index 3805aed..dcfe947 100644 (file)
--- a/lib/librte_eal/common/eal_common_pci.c
+++ b/lib/librte_eal/common/eal_common_pci.c
@@ -137,61 +137,6 @@ pci_unmap_resource(void *requested_addr, size_t size)
                                requested_addr);
 }
 
-/* Map pci device */
-static int
-pci_map_device(struct rte_pci_device *dev)
-{
-       int ret = -1;
-
-       /* try mapping the NIC resources using VFIO if it exists */
-       switch (dev->kdrv) {
-       case RTE_KDRV_VFIO:
-#ifdef VFIO_PRESENT
-               if (pci_vfio_is_enabled())
-                       ret = pci_vfio_map_resource(dev);
-#endif
-               break;
-       case RTE_KDRV_IGB_UIO:
-       case RTE_KDRV_UIO_GENERIC:
-       case RTE_KDRV_NIC_UIO:
-               /* map resources for devices that use uio */
-               ret = pci_uio_map_resource(dev);
-               break;
-       default:
-               RTE_LOG(DEBUG, EAL, "  Not managed by a supported kernel driver,"
-                       " skipped\n");
-               ret = 1;
-               break;
-       }
-
-       return ret;
-}
-
-/* Unmap pci device */
-static void
-pci_unmap_device(struct rte_pci_device *dev)
-{
-       if (dev == NULL)
-               return;
-
-       /* try unmapping the NIC resources using VFIO if it exists */
-       switch (dev->kdrv) {
-       case RTE_KDRV_VFIO:
-               RTE_LOG(ERR, EAL, "Hotplug doesn't support vfio yet\n");
-               break;
-       case RTE_KDRV_IGB_UIO:
-       case RTE_KDRV_UIO_GENERIC:
-       case RTE_KDRV_NIC_UIO:
-               /* unmap resources for devices that use uio */
-               pci_uio_unmap_resource(dev);
-               break;
-       default:
-               RTE_LOG(DEBUG, EAL, "  Not managed by a supported kernel driver,"
-                       " skipped\n");
-               break;
-       }
-}
-
 /*
  * If vendor/device ID match, call the devinit() function of the
  * driver.
@@ -268,7 +213,7 @@ rte_eal_pci_probe_one_driver(struct rte_pci_driver *dr, struct rte_pci_device *d
  * driver.
  */
 static int
-rte_eal_pci_close_one_driver(struct rte_pci_driver *dr,
+rte_eal_pci_detach_dev(struct rte_pci_driver *dr,
                struct rte_pci_device *dev)
 {
        const struct rte_pci_id *id_table;
@@ -301,7 +246,6 @@ rte_eal_pci_close_one_driver(struct rte_pci_driver *dr,
                RTE_LOG(DEBUG, EAL, "  remove driver: %x:%x %s\n", dev->id.vendor_id,
                                dev->id.device_id, dr->name);
 
-               /* call the driver devuninit() function */
                if (dr->devuninit && (dr->devuninit(dev) < 0))
                        return -1;      /* negative value is an error */
 
@@ -352,7 +296,7 @@ pci_probe_all_drivers(struct rte_pci_device *dev)
  * failed, return 1 if no driver is found for this device.
  */
 static int
-pci_close_all_drivers(struct rte_pci_device *dev)
+pci_detach_all_drivers(struct rte_pci_device *dev)
 {
        struct rte_pci_driver *dr = NULL;
        int rc = 0;
@@ -361,7 +305,7 @@ pci_close_all_drivers(struct rte_pci_device *dev)
                return -1;
 
        TAILQ_FOREACH(dr, &pci_driver_list, next) {
-               rc = rte_eal_pci_close_one_driver(dr, dev);
+               rc = rte_eal_pci_detach_dev(dr, dev);
                if (rc < 0)
                        /* negative value is an error */
                        return -1;
@@ -405,11 +349,10 @@ err_return:
 }
 
 /*
- * Find the pci device specified by pci address, then invoke close function of
- * the driver of the devive.
+ * Detach device specified by its pci address.
  */
 int
-rte_eal_pci_close_one(const struct rte_pci_addr *addr)
+rte_eal_pci_detach(const struct rte_pci_addr *addr)
 {
        struct rte_pci_device *dev = NULL;
        int ret = 0;
@@ -421,7 +364,7 @@ rte_eal_pci_close_one(const struct rte_pci_addr *addr)
                if (rte_eal_compare_pci_addr(&dev->addr, addr))
                        continue;
 
-               ret = pci_close_all_drivers(dev);
+               ret = pci_detach_all_drivers(dev);
                if (ret < 0)
                        goto err_return;