Changeset 4110

Timestamp:

08/25/06 16:00:59 (7 years ago)

Author:

khali

Message:

Clean up the PCI device probing, reducing complexity from O(N^{2) to O(N).}

Files:

• lm-sensors/trunk/prog/detect/sensors-detect (modified) (2 diffs)

lm-sensors/trunk/prog/detect/sensors-detect

@@ -2385 +2385 @@
 
   # Generic detection loop
-  while ( ($key, $device) = each %pci_list) {
-    foreach $try (@pci_adapters) {
-      if ($try->{vendid} == $device->{vendid} &&
-          $try->{devid} == $device->{devid} &&
-          (!defined($try->{func}) || $try->{func} == $device->{func})) {
+  foreach $try (@pci_adapters) {
+    $key = sprintf("%04x:%04x", $try->{vendid}, $try->{devid});
+    if (exists $pci_list{$key}) {
+        $device = $pci_list{$key};
         printf "Use driver `%s' for device %02x:%02x.%x: %s\n",
                $try->{driver},
@@ -2402 +2401 @@
         }
         push @res,$try->{driver};
-      }
     }
   }