Changeset 5470

Timestamp:

11/30/08 13:53:18 (5 years ago)

Author:

khali

Message:

Rework adapter_pci_detection to require fewer levels of indentation.

Files:

• lm-sensors/branches/lm-sensors-3.0.0/prog/detect/sensors-detect (modified) (1 diff)

lm-sensors/branches/lm-sensors-3.0.0/prog/detect/sensors-detect

@@ -2208 +2208 @@
         foreach $try (@pci_adapters) {
                 $key = sprintf("%04x:%04x", $try->{vendid}, $try->{devid});
-                if (exists $pci_list{$key}) {
-                        $device = $pci_list{$key};
-                        if ($try->{driver} =~ m/^to-be-/) {
-                                printf "No known driver for device \%s: \%s\n",
-                                       pci_busid($device), $try->{procid};
-
-                                if ($try->{driver} eq "to-be-tested") {
-                                        print "\nWe are currently looking for testers for this adapter!\n".
-                                              "Please check http://www.lm-sensors.org/wiki/Devices\n".
-                                              "and/or contact us if you want to help.\n\n";
-                                        print "Continue... ";
-                                        <STDIN>;
-                                        print "\n";
-                                }
-                        } else {
-                                printf "Using driver `\%s' for device \%s: \%s\n",
-                                       $try->{driver}, pci_busid($device),
-                                       $try->{procid};
-                                $count++;
-                                load_module($try->{driver});
-                        }
-
-                        # Delete from detected SMBus device list
-                        delete $smbus{$key};
+                next unless exists $pci_list{$key};
+
+                $device = $pci_list{$key};
+                if ($try->{driver} eq "to-be-tested") {
+                        print "\nWe are currently looking for testers for this adapter!\n".
+                              "Please check http://www.lm-sensors.org/wiki/Devices\n".
+                              "and/or contact us if you want to help.\n\n".
+                              "Continue... ";
+                        <STDIN>;
+                        print "\n";
                 }
+
+                if ($try->{driver} =~ m/^to-be-/) {
+                        printf "No known driver for device \%s: \%s\n",
+                               pci_busid($device), $try->{procid};
+                } else {
+                        printf "Using driver `\%s' for device \%s: \%s\n",
+                               $try->{driver}, pci_busid($device),
+                               $try->{procid};
+                        $count++;
+                        load_module($try->{driver});
+                }
+
+                # Delete from detected SMBus device list
+                delete $smbus{$key};
         }