Changeset 5449

Timestamp:

11/27/08 22:46:01 (5 years ago)

Author:

khali

Message:

Consistently don't quote hash keys which don't need quotes. Use
single quotes when quotes are needed.

Files:

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

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

@@ -2269 +2269 @@
     next unless m/^i2c-(\d+)$/;
     $entry = {}; # New entry
-    $entry->{'name'} = sysfs_device_attribute("${class_dir}/i2c-$1", "name")
-                    || sysfs_device_attribute("${class_dir}/i2c-$1/device", "name");
-    next if $entry->{'name'} eq "ISA main adapter";
+    $entry->{name} = sysfs_device_attribute("${class_dir}/i2c-$1", "name")
+                  || sysfs_device_attribute("${class_dir}/i2c-$1/device", "name");
+    next if $entry->{name} eq "ISA main adapter";
 
     # First try to get the I2C adapter driver name from sysfs, and if it
     # fails, fall back to searching our list of known I2C adapters.
-    $entry->{'driver'} = sysfs_device_driver("${class_dir}/i2c-$1/device")
-                      || find_i2c_adapter_driver($entry->{'name'})
-                      || 'UNKNOWN';
+    $entry->{driver} = sysfs_device_driver("${class_dir}/i2c-$1/device")
+                    || find_i2c_adapter_driver($entry->{name})
+                    || 'UNKNOWN';
     $i2c_adapters[$1] = $entry;
   }
@@ -2447 +2447 @@
 
   # first, determine which driver if any...
-  if (exists $pci_list{"1039:0016"}) {
+  if (exists $pci_list{'1039:0016'}) {
     $driver = "i2c-sis96x";
-  } elsif (exists $pci_list{"1039:0008"}) {
+  } elsif (exists $pci_list{'1039:0008'}) {
     $driver = "i2c-sis5595";
   }
@@ -2920 +2920 @@
 
   foreach my $chip (@chip_ids) {
-    next unless defined $chip->{'i2c_addrs'};
-    next if $chip->{'driver'} eq 'not-a-sensor';
-    foreach $addr (@{$chip->{'i2c_addrs'}}) {
+    next unless defined $chip->{i2c_addrs};
+    next if $chip->{driver} eq 'not-a-sensor';
+    foreach $addr (@{$chip->{i2c_addrs}}) {
       $used[$addr]++;
     }
@@ -5067 +5067 @@
         my $probecpu;
         foreach $probecpu (@cpu) {
-                if ($probecpu->{'vendor_id'} eq 'GenuineIntel' &&
-                                $probecpu->{'cpu family'} == 6 &&
-                                ($probecpu->{'model'} == 14 ||
-                                 $probecpu->{'model'} == 15 ||
-                                 $probecpu->{'model'} == 0x16 ||
-                                 $probecpu->{'model'} == 0x17)) {
+                if ($probecpu->{vendor_id} eq 'GenuineIntel' &&
+                                $probecpu->{cpu_family} == 6 &&
+                                ($probecpu->{model} == 14 ||
+                                 $probecpu->{model} == 15 ||
+                                 $probecpu->{model} == 0x16 ||
+                                 $probecpu->{model} == 0x17)) {
                         return 9;
                 }
@@ -5084 +5084 @@
         my $probecpu;
         foreach $probecpu (@cpu) {
-                if ($probecpu->{'vendor_id'} eq 'CentaurHauls' &&
-                                $probecpu->{'cpu family'} == 6 &&
-                                ($probecpu->{'model'} == 0xa ||
-                                 $probecpu->{'model'} == 0xd)) {
+                if ($probecpu->{vendor_id} eq 'CentaurHauls' &&
+                                $probecpu->{cpu_family} == 6 &&
+                                ($probecpu->{model} == 0xa ||
+                                 $probecpu->{model} == 0xd)) {
                         return 9;
                 }
@@ -5287 +5287 @@
   for (my $dev_nr = 0; $dev_nr < @i2c_adapters; $dev_nr++) {
     next unless exists $i2c_adapters[$dev_nr];
-    my $adap = $i2c_adapters[$dev_nr]->{'name'};
+    my $adap = $i2c_adapters[$dev_nr]->{name};
     print "\n";
     print "Next adapter: $adap (i2c-$dev_nr)\n";
@@ -5304 +5304 @@
       @not_to_scan = parse_not_to_scan(0x03, 0x77, $inp2);
     }
-    scan_adapter($dev_nr, $adap, $i2c_adapters[$dev_nr]->{'driver'},
+    scan_adapter($dev_nr, $adap, $i2c_adapters[$dev_nr]->{driver},
                  \@not_to_scan) unless $inp =~ /^\s*[Nn]/;
   }