diff options
| -rw-r--r-- | pci.c | 6 | ||||
| -rw-r--r-- | usb.c | 5 |
2 files changed, 3 insertions, 8 deletions
@@ -6,9 +6,6 @@ #include "libldetect-private.h" #include "common.h" -static int pci_find_modules(struct pciusb_entries entries, int no_subid) { - return pciusb_find_modules(entries, "pcitable", no_subid); -} extern struct pciusb_entries pci_probe(int probe_type) { FILE *f; @@ -63,7 +60,8 @@ extern struct pciusb_entries pci_probe(int probe_type) { fclose(f); r.entries = memdup(t, sizeof(struct pciusb_entry) * r.nb); - if (pci_find_modules(r, probe_type)) return r; + if (pciusb_find_modules(r, "pcitable", probe_type)) + return r; /* ok, let's try again with subids */ if (probe_type == 0) return pci_probe(1); @@ -5,9 +5,6 @@ #include "libldetect-private.h" #include "common.h" -static int usb_find_modules(struct pciusb_entries entries) { - return pciusb_find_modules(entries, "usbtable", 1 /* no_subid */); -} extern struct pciusb_entries usb_probe(void) { FILE *f; @@ -54,7 +51,7 @@ extern struct pciusb_entries usb_probe(void) { fclose(f); r.entries = memdup(t, sizeof(struct pciusb_entry) * r.nb); - usb_find_modules(r); + pciusb_find_modules(r, "usbtable", 1 /* no_subid */); return r; } |