summaryrefslogtreecommitdiffstats
path: root/pciusb.c
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2007-09-11 17:13:38 +0000
committerOlivier Blin <oblin@mandriva.com>2007-09-11 17:13:38 +0000
commit8564faa63a158dcbb5bb68921c0fd34f2d3f54ac (patch)
treeb6f8a6e24ad8076a7a9baa9ae491aeb7b9518163 /pciusb.c
parent0d47791547ef5a45b2120075e512cc99f89ee8c3 (diff)
downloadldetect-8564faa63a158dcbb5bb68921c0fd34f2d3f54ac.tar
ldetect-8564faa63a158dcbb5bb68921c0fd34f2d3f54ac.tar.gz
ldetect-8564faa63a158dcbb5bb68921c0fd34f2d3f54ac.tar.bz2
ldetect-8564faa63a158dcbb5bb68921c0fd34f2d3f54ac.tar.xz
ldetect-8564faa63a158dcbb5bb68921c0fd34f2d3f54ac.zip
do not read modules.dep and do not try to find command, we always try to find a modalias, not a module name (lspcidrake is now twice faster)
Diffstat (limited to 'pciusb.c')
-rw-r--r--pciusb.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/pciusb.c b/pciusb.c
index 2c42a04..f0a8382 100644
--- a/pciusb.c
+++ b/pciusb.c
@@ -48,7 +48,6 @@ static void find_modules_through_aliases(struct pciusb_entries *entries) {
char *modalias = NULL;
char *modalias_path;
FILE *file;
- LIST_HEAD(list);
asprintf(&modalias_path, "/sys/bus/pci/devices/%04x:%02x:%02x.%x/modalias", e->pci_domain, e->pci_bus, e->pci_device, e->pci_function);
file = fopen(modalias_path, "r");
if (file) {
@@ -72,11 +71,6 @@ static void find_modules_through_aliases(struct pciusb_entries *entries) {
if (!aliases) {
/* We only use canned aliases as last resort. */
- read_depends(dirname, modalias, &list);
-
- if (list_empty(&list)
- && !find_command(modalias, commands))
- {
char *alias_filelist[] = {
table_name_to_file("preferred-modules.alias"),
aliasdefault,
@@ -91,7 +85,6 @@ static void find_modules_through_aliases(struct pciusb_entries *entries) {
aliases = apply_blacklist(aliases, blacklist);
alias_file++;
}
- }
}
if (aliases) {
// take the last one because we find eg: generic/ata_generic/sata_sil