bus/pci: remove unused scan by address
PATCH 1/1 bus/pci: remove unused scan by address
The function pci_update_device was used to scan a device for probing by PCI address.
This private function (and implementations) are unused since such probing is removed.
Fixes f3bac43b60da ("bus/pci: remove unused function to probe by address")
Signed-off-by Thomas Monjalon <[email protected]>
--- drivers/bus/pci/bsd/pci.c | 49 ----------------------------------- drivers/bus/pci/linux/pci.c | 12 --------- drivers/bus/pci/private.h | 13 ---------- drivers/bus/pci/windows/pci.c | 11 -------- 4 files changed, 85 deletions(-)
drivers/bus/pci/bsd/pci.c +0 -49
@@ -401,55 +401,6 @@ pci_device_iova_mode(const struct rte_pci_driver *pdrv __rte_unused,return RTE_IOVA_PA ; } -int -pci_update_device (const struct rte_pci_addr *addr) -{ -int fd; -struct pci_conf matches[2 ]; -struct pci_match_conf match = { - .pc_sel = { - .pc_domain = addr->domain, - .pc_bus = addr->bus, - .pc_dev = addr->devid, - .pc_func = addr->function, - }, - }; -struct pci_conf_io conf_io = { - .pat_buf_len =0 , - .num_patterns =1 , - .patterns = &match, - .match_buf_len =sizeof (matches), - .matches = &matches[0 ], - }; - - fd =open ("/dev/pci" ,O_RDONLY ); -if (fd <0 ) { -RTE_LOG (ERR ,EAL ,"%s(): error opening /dev/pci\n" , __func__); - goto error; - } - -if (ioctl (fd,PCIOCGETCONF , &conf_io) <0 ) { -RTE_LOG (ERR ,EAL ,"%s(): error with ioctl on /dev/pci: %s\n" , - __func__,strerror (errno)); - goto error; - } - -if (conf_io.num_matches !=1 ) - goto error; - -if (pci_scan_one (fd, &matches[0 ]) <0 ) - goto error; - -close (fd); - -return 0 ; - -error: -if (fd >=0 ) -close (fd); -return -1 ; -} -/* Read PCI config space. */ int rte_pci_read_config (const struct rte_pci_device *dev,void *buf,size_t len,off_t offset)
drivers/bus/pci/linux/pci.c +0 -12
@@ -397,18 +397,6 @@ pci_scan_one(const char *dirname, const struct rte_pci_addr *addr)return 0 ; } -int -pci_update_device (const struct rte_pci_addr *addr) -{ -char filename[PATH_MAX ]; - -snprintf (filename,sizeof (filename),"%s/" PCI_PRI_FMT , -rte_pci_get_sysfs_path (), addr->domain, addr->bus, addr->devid, - addr->function); - -return pci_scan_one (filename, addr); -} -/* * split up a pci address into its constituent parts. */
drivers/bus/pci/private.h +0 -13
@@ -66,19 +66,6 @@ void rte_pci_add_device(struct rte_pci_device *pci_dev);void rte_pci_insert_device (struct rte_pci_device *exist_pci_dev,struct rte_pci_device *new_pci_dev); -/** -* Update a pci device object by asking the kernel for the latest information. -* -* This function is private to EAL. -* -* @param addr -* The PCI Bus-Device-Function address to look for -* @return -* - 0 on success. -* - negative on error. -*/ -int pci_update_device (const struct rte_pci_addr *addr); -/** * A structure describing a PCI mapping. */
drivers/bus/pci/windows/pci.c +0 -11
@@ -49,17 +49,6 @@ rte_pci_unmap_device(struct rte_pci_device *dev __rte_unused)*/ } -int -pci_update_device(const struct rte_pci_addr *addr __rte_unused) -{ -/* This function is not implemented on Windows. -* We really should short-circuit the call to these functions by -* clearing the RTE_PCI_DRV_NEED_MAPPING flag -* in the rte_pci_driver flags. -*/ -return 0 ; -} -/* Read PCI config space. */ int rte_pci_read_config(const struct rte_pci_device *dev __rte_unused,
Signature · 1 line
2.28.0
Quoted 10 lines · Thomas Monjalon
The function
pci_update_devicewas used to scan a device for probing by PCI address.
This private function (and implementations) are unused since such probing is removed.Fixes f3bac43b60da ("bus/pci: remove unused function to probe by address")Signed-off-by Thomas Monjalon <[email protected]>
LGTM.
Acked-by David Marchand <[email protected]>
Signature · 1 line
David Marchand
Thomas Monjalon
Applied20/10/2020 11:10, David Marchand:
Quoted 7 lines · Thomas Monjalon
Quoted 6 lines
The function
pci_update_devicewas used to scan a device for probing by PCI address.
This private function (and implementations) are unused since such probing is removed.
Quoted 7 lines
Quoted 4 lines
Fixes f3bac43b60da ("bus/pci: remove unused function to probe by address")Signed-off-by Thomas Monjalon <[email protected]>LGTM.
Acked-by David Marchand <[email protected]>
Applied