Syslinux - Aug 2008 - [PATCH] pci: rename get_module_name_from_pci_ids

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.

- Sebastian

Index: syslinux-3.71-12-ga19312b/com32/include/sys/pci.h
==================================================================---
syslinux-3.71-12-ga19312b.orig/com32/include/sys/pci.h	2008-08-16
19:39:41.000000000 +0200
+++ syslinux-3.71-12-ga19312b/com32/include/sys/pci.h	2008-08-16
19:40:06.000000000 +0200
@@ -96,5 +96,5 @@
 extern int pci_scan(struct pci_bus_list *pci_bus_list, struct pci_device_list
*pci_device_list);
 extern struct match * find_pci_device(struct pci_device_list *pci_device_list,
struct match *list);
 extern void get_name_from_pci_ids(struct pci_device_list *pci_device_list);
-extern void get_module_name_from_pci_ids(struct pci_device_list
*pci_device_list);
+extern void get_module_name_from_pcimap(struct pci_device_list
*pci_device_list);
 #endif /* _SYS_PCI_H */
Index: syslinux-3.71-12-ga19312b/com32/lib/pci/scan.c
==================================================================---
syslinux-3.71-12-ga19312b.orig/com32/lib/pci/scan.c	2008-08-16
19:39:47.000000000 +0200
+++ syslinux-3.71-12-ga19312b/com32/lib/pci/scan.c	2008-08-16 19:40:25.000000000
+0200
@@ -73,7 +73,7 @@
 
 /* Try to match any pci device to the appropriate kernel module */
 /* it uses the modules.pcimap from the boot device*/
-void get_module_name_from_pci_ids(struct pci_device_list *pci_device_list)
+void get_module_name_from_pcimap(struct pci_device_list *pci_device_list)
 {
   char line[MAX_LINE];
   char module_name[21]; // the module name field is 21 char long
Index: syslinux-3.71-12-ga19312b/com32/modules/pcitest.c
==================================================================---
syslinux-3.71-12-ga19312b.orig/com32/modules/pcitest.c	2008-08-16
19:39:52.000000000 +0200
+++ syslinux-3.71-12-ga19312b/com32/modules/pcitest.c	2008-08-16
19:40:37.000000000 +0200
@@ -109,7 +109,7 @@
   get_name_from_pci_ids(&pci_device_list);
 
   /* Detecting which kernel module should match each device */
-  get_module_name_from_pci_ids(&pci_device_list);
+  get_module_name_from_pcimap(&pci_device_list);
 
   /* display the pci devices we found */
   display_pci_bus(&pci_bus_list,true);

Sebastian Herbszt wrote:
> 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.
> 
> - Sebastian
Hi Sebastian,

These last couple of patches don't apply to the current top of tree 
(with the newpci branch merged).  Could you please resubmit if they are 
still releavant?

	-hpa