From c4ddb8c11aadc695940715be3420c1a97364935a Mon Sep 17 00:00:00 2001 From: Erwan Velu Date: Sun, 29 Mar 2009 21:28:23 +0200 Subject: [PATCH] pci: Rename get_module_name_from_pci_ids Impact: none Rename get_module_name_from_pci_ids to get_module_name_from_pcimap since the module names are read from the modules.pcimap and not pci.ids file. Signed-off-by: Sebastian Herbszt (herbszt@gmx.de) --- com32/hdt/hdt-common.c | 2 +- com32/include/sys/pci.h | 2 +- com32/lib/pci/scan.c | 2 +- com32/modules/pcitest.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/com32/hdt/hdt-common.c b/com32/hdt/hdt-common.c index 8ab0f12..12dc22a 100644 --- a/com32/hdt/hdt-common.c +++ b/com32/hdt/hdt-common.c @@ -391,7 +391,7 @@ void detect_pci(struct s_hardware *hardware) printf("PCI: Resolving module names\n"); /* Detecting which kernel module should match each device */ hardware->modules_pcimap_return_code = - get_module_name_from_pci_ids(hardware->pci_domain, + get_module_name_from_pcimap(hardware->pci_domain, hardware->modules_pcimap_path); /* We try to detect the pxe stuff to populate the PXE: field of pci devices */ diff --git a/com32/include/sys/pci.h b/com32/include/sys/pci.h index 18e9754..2e1871e 100644 --- a/com32/include/sys/pci.h +++ b/com32/include/sys/pci.h @@ -134,7 +134,7 @@ void free_pci_domain(struct pci_domain *domain); struct match * find_pci_device(const struct pci_domain *pci_domain, struct match *list); int get_name_from_pci_ids(struct pci_domain *pci_domain, char *pciids_path); -int get_module_name_from_pci_ids(struct pci_domain *pci_domain, char *modules_pcimap_path); +int get_module_name_from_pcimap(struct pci_domain *pci_domain, char *modules_pcimap_path); int get_class_name_from_pci_ids(struct pci_domain *pci_domain, char *pciids_path); void gather_additional_pci_config(struct pci_domain *domain); #endif /* _SYS_PCI_H */ diff --git a/com32/lib/pci/scan.c b/com32/lib/pci/scan.c index adfec59..39f743b 100644 --- a/com32/lib/pci/scan.c +++ b/com32/lib/pci/scan.c @@ -73,7 +73,7 @@ static int hex_to_int(char *hexa) /* Try to match any pci device to the appropriate kernel module */ /* it uses the modules.pcimap from the boot device */ -int get_module_name_from_pci_ids(struct pci_domain *domain, char *modules_pcimap_path) +int get_module_name_from_pcimap(struct pci_domain *domain, char *modules_pcimap_path) { char line[MAX_LINE]; char module_name[21]; // the module name field is 21 char long diff --git a/com32/modules/pcitest.c b/com32/modules/pcitest.c index d13c3a6..8b97fbe 100644 --- a/com32/modules/pcitest.c +++ b/com32/modules/pcitest.c @@ -135,7 +135,7 @@ int main(int argc, char *argv[]) printf("PCI: Looking for Kernel modules\n"); /* Detecting which kernel module should match each device */ - return_code=get_module_name_from_pci_ids(pci_domain,"modules.pcimap"); + return_code=get_module_name_from_pcimap(pci_domain,"modules.pcimap"); if (return_code == -ENOMODULESPCIMAP) { printf("PCI: ERROR !\n"); printf("PCI: Unable to open modules.pcimap in the same directory as pcitest.c32.\n"); -- 2.7.4