remove references to private PCI probe function

[dpdk.git] / drivers / bus / pci / pci_common.c

diff --git a/drivers/bus/pci/pci_common.c b/drivers/bus/pci/pci_common.c
index 6b46b4f..6487055 100644 (file)
--- a/drivers/bus/pci/pci_common.c
+++ b/drivers/bus/pci/pci_common.c
@@ -136,7 +136,7 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr,
                /* Match of device and driver failed */
                return 1;
 
-       RTE_LOG(INFO, EAL, "PCI device "PCI_PRI_FMT" on NUMA socket %i\n",
+       RTE_LOG(DEBUG, EAL, "PCI device "PCI_PRI_FMT" on NUMA socket %i\n",
                        loc->domain, loc->bus, loc->devid, loc->function,
                        dev->device.numa_node);
 
@@ -161,7 +161,7 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr,
                return -EEXIST;
        }
 
-       RTE_LOG(INFO, EAL, "  probe driver: %x:%x %s\n", dev->id.vendor_id,
+       RTE_LOG(DEBUG, EAL, "  probe driver: %x:%x %s\n", dev->id.vendor_id,
                dev->id.device_id, dr->driver.name);
 
        /*
@@ -195,6 +195,10 @@ rte_pci_probe_one_driver(struct rte_pci_driver *dr,
                }
        }
 
+       RTE_LOG(INFO, EAL, "Probe PCI driver: %s (%x:%x) device: "PCI_PRI_FMT" (socket %i)\n",
+                       dr->driver.name, dev->id.vendor_id, dev->id.device_id,
+                       loc->domain, loc->bus, loc->devid, loc->function,
+                       dev->device.numa_node);
        /* call the driver probe() function */
        ret = dr->probe(dr, dev);
        if (already_probed)
@@ -247,6 +251,7 @@ rte_pci_detach_dev(struct rte_pci_device *dev)
 
        /* clear driver structure */
        dev->driver = NULL;
+       dev->device.driver = NULL;
 
        if (dr->drv_flags & RTE_PCI_DRV_NEED_MAPPING)
                /* unmap resources for devices that use igb_uio */
@@ -287,8 +292,8 @@ pci_probe_all_drivers(struct rte_pci_device *dev)
  * all registered drivers that have a matching entry in its id_table
  * for discovered devices.
  */
-int
-rte_pci_probe(void)
+static int
+pci_probe(void)
 {
        struct rte_pci_device *dev = NULL;
        size_t probed = 0, failed = 0;
@@ -674,7 +679,7 @@ rte_pci_get_iommu_class(void)
 struct rte_pci_bus rte_pci_bus = {
        .bus = {
                .scan = rte_pci_scan,
-               .probe = rte_pci_probe,
+               .probe = pci_probe,
                .find_device = pci_find_device,
                .plug = pci_plug,
                .unplug = pci_unplug,