Changeset 5443

Timestamp:

11/27/08 18:53:36 (4 years ago)

Author:

khali

Message:

Don't create module options for bus drivers we don't even need to load.

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

@@ -5142 +5142 @@
   my ($modprobes, $configfile);
 
+  foreach $chip (@chips_detected) {
+    foreach $detection (@{$chip->{detected}}) {
+      # Tag adapters which host hardware monitoring chips we want to access
+      if (exists $detection->{i2c_devnr}
+       && !exists $detection->{isa_addr}) {
+           $i2c_adapters[$detection->{i2c_devnr}]->{used}++;
+      }
+
+      if (exists $detection->{isa_addr}) {
+           $isa = 1;
+      }
+    }
+    if ($chip->{driver} eq "ipmisensors") {
+         $ipmi = 1;
+    }
+  }
+
   # Handle aliases
   # As of kernel 2.6.28, alias detection is handled by kernel drivers
@@ -5150 +5167 @@
       foreach $detection (@{$chip->{detected}}) {
         if (exists $detection->{i2c_driver} and
-            exists $detection->{isa_addr}) {
+            exists $detection->{isa_addr} and
+            $i2c_adapters[$detection->{i2c_devnr}]->{used}) {
           push @optionlist, $detection->{i2c_devnr},
                             $detection->{i2c_addr};
@@ -5164 +5182 @@
                              shift @optionlist) while @optionlist;
       $configfile .= "\n";
-    }
-  }
-
-  foreach $chip (@chips_detected) {
-    foreach $detection (@{$chip->{detected}}) {
-      # Tag adapters which host hardware monitoring chips we want to access
-      if (exists $detection->{i2c_devnr}
-       && !exists $detection->{isa_addr}) {
-           $i2c_adapters[$detection->{i2c_devnr}]->{used}++;
-      }
-
-      if (exists $detection->{isa_addr}) {
-           $isa = 1;
-      }
-    }
-    if ($chip->{driver} eq "ipmisensors") {
-         $ipmi = 1;
     }
   }