Changeset 5592 for lm-sensors/branches/lm-sensors-3.0.0/prog/detect/sensors-detect

Timestamp:

01/12/09 17:39:14 (4 years ago)

Author:

khali

Message:

Get rid of useless variables $isa and $ipmi.

Files:

• lm-sensors/branches/lm-sensors-3.0.0/prog/detect/sensors-detect (modified) (3 diffs)

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

@@ -5055 +5055 @@
 {
         my ($driver, $detection, $adap);
-        my ($isa, $ipmi);
         my ($configfile, %bus_modules, %hwmon_modules);
 
@@ -5066 +5065 @@
                         }
 
-                        if (exists $detection->{isa_addr}) {
-                                $isa = 1;
+                        # i2c-isa is loaded automatically (as a dependency)
+                        # since 2.6.14, and will soon be gone.
+                        if (exists $detection->{isa_addr}
+                         && !kernel_version_at_least(2, 6, 18)) {
+                                $bus_modules{"i2c-isa"}++
                         }
                 }
                 if ($driver eq "ipmisensors") {
-                        $ipmi = 1;
+                        $bus_modules{"ipmi-si"}++;
                 }
         }
@@ -5106 +5108 @@
                 next if not defined $configfile and not $adap->{used};
                 $bus_modules{$adap->{driver}}++;
-        }
-
-        # i2c-isa is loaded automatically (as a dependency) since 2.6.14,
-        # and will soon be gone.
-        if ($isa && !kernel_version_at_least(2, 6, 18)) {
-                $bus_modules{"i2c-isa"}++;
-        }
-        if ($ipmi) {
-                $bus_modules{"ipmi-si"}++;
         }