drivers/bus: move driver assignment to end of probing

[dpdk.git] / drivers / bus / pci / rte_bus_pci.h

diff --git a/drivers/bus/pci/rte_bus_pci.h b/drivers/bus/pci/rte_bus_pci.h
index 828acc5..b9a0f30 100644 (file)
--- a/drivers/bus/pci/rte_bus_pci.h
+++ b/drivers/bus/pci/rte_bus_pci.h
@@ -62,10 +62,12 @@ struct rte_pci_device {
        struct rte_mem_resource mem_resource[PCI_MAX_RESOURCE];
                                            /**< PCI Memory Resource */
        struct rte_intr_handle intr_handle; /**< Interrupt handle */
-       struct rte_pci_driver *driver;      /**< Associated driver */
+       struct rte_pci_driver *driver;      /**< PCI driver used in probing */
        uint16_t max_vfs;                   /**< sriov enable if not zero */
        enum rte_kernel_driver kdrv;        /**< Kernel driver passthrough */
        char name[PCI_PRI_STR_SIZE+1];      /**< PCI location (ASCII) */
+       struct rte_intr_handle vfio_req_intr_handle;
+                               /**< Handler of VFIO request interrupt */
 };
 
 /**
@@ -191,8 +193,7 @@ void rte_pci_register(struct rte_pci_driver *driver);
 
 /** Helper for PCI device registration from driver (eth, crypto) instance */
 #define RTE_PMD_REGISTER_PCI(nm, pci_drv) \
-RTE_INIT(pciinitfn_ ##nm); \
-static void pciinitfn_ ##nm(void) \
+RTE_INIT(pciinitfn_ ##nm) \
 {\
        (pci_drv).driver.name = RTE_STR(nm);\
        rte_pci_register(&pci_drv); \