Changeset 5267

Timestamp:

05/28/08 11:32:41 (6 months ago)

Author:

khali

Message:

More coding style cleanups. This time, most of them are to make function
calls look like function calls, but there are also a couple whitespace
fixes and needless parentheses removed.

Files:

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

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

@@ -2167 +2167 @@
-sub initialize_ioports
-{
- 
+
-    or die "/dev/port: $!\n";
- IOPORTS
+(IOPORTS)
-}
-
-sub close_ioports
-{
- 
+
-    or print "Warning: $!\n";
-}
@@ -2183 +2183 @@
-{
-  my ($res, $nrchars);
- IOPORTS, $_[0], 0
- IOPORTS, $res, 1
+(IOPORTS, $_[0], 0)
+(IOPORTS, $res, 1)
-  return -1 if not defined $nrchars or $nrchars != 1;
- "C", $res
+("C", $res)
-  return $res;
-}
@@ -2195 +2195 @@
-sub outb
-{
- "C", $_[1]
- IOPORTS, $_[0], 0
- IOPORTS, $towrite, 1
+("C", $_[1])
+(IOPORTS, $_[0], 0)
+(IOPORTS, $towrite, 1)
-  return -1 if not defined $nrchars or $nrchars != 1;
-  return 0;
@@ -2208 +2208 @@
-sub isa_read_byte
-{
- $_[0], $_[2]
- $_[1]
+($_[0], $_[2])
+($_[1])
-}
-
@@ -2219 +2219 @@
-sub isa_write_byte
-{
- $_[0], $_[2]
- $_[1], $_[3]
+($_[0], $_[2])
+($_[1], $_[3])
-}
-
@@ -2243 +2243 @@
-    }
-  }
- INPUTFILE
+(INPUTFILE)
-
-  my $use_udev = 0;
@@ -2256 +2256 @@
-      }
-    }
- INPUTFILE
+(INPUTFILE)
-  }
-
@@ -2342 +2342 @@
-  }
-  push @cpu, $entry if scalar keys(%{$entry}); # Last entry
- INPUTFILE
+(INPUTFILE)
-}
-
@@ -2525 +2525 @@
-sub adapter_pci_detection_sis_96x
-{
-=
+ = 
-
-  # first, determine which driver if any...
@@ -2676 +2676 @@
-{
-  my $file = shift;
- "L", 0
-
- $file, IOCTL_I2C_FUNCS, $funcs
- "L", $funcs
+("L", 0)
+
+($file, IOCTL_I2C_FUNCS, $funcs)
+("L", $funcs)
-
-  return $funcs;
@@ -2696 +2696 @@
-
-  $addr += 0; # Make sure it's a number not a string
- $file, IOCTL_I2C_SLAVE, $addr
+($file, IOCTL_I2C_SLAVE, $addr)
-  return 1;
-}
@@ -2716 +2716 @@
-{
-  my ($file, $read_write, $command, $size, $data) = @_;
- "C32", @$data
- "C2x2Ip", (
- $file, IOCTL_I2C_SMBUS, $ioctl_data
- "C32", $data_array
+("C32", @$data)
+("C2x2Ip", 
+($file, IOCTL_I2C_SMBUS, $ioctl_data)
+("C32", $data_array)
-  return 1;
-}
@@ -2730 +2730 @@
-  my ($file, $value) = @_;
-  my @data;
- $file, $value, 0, SMBUS_QUICK, \@data
+($file, $value, 0, SMBUS_QUICK, \@data)
-         or return -1;
-  return 0;
@@ -2741 +2741 @@
-  my ($file) = @_;
-  my @data;
- $file, SMBUS_READ, 0, SMBUS_BYTE, \@data
+($file, SMBUS_READ, 0, SMBUS_BYTE, \@data)
-         or return -1;
-  return $data[0];
@@ -2759 +2759 @@
-    return $i2c_byte_cache[$command];
-  }
- $file, SMBUS_READ, $command, SMBUS_BYTE_DATA, \@data
+($file, SMBUS_READ, $command, SMBUS_BYTE_DATA, \@data)
-         or return -1;
-  return ($i2c_byte_cache[$command] = $data[0]);
@@ -2777 +2777 @@
-  my ($file, $command) = @_;
-  my @data;
- $file, SMBUS_READ, $command, SMBUS_WORD_DATA, \@data
+($file, SMBUS_READ, $command, SMBUS_WORD_DATA, \@data)
-         or return -1;
-  return $data[0] + 256 * $data[1];
@@ -2920 +2920 @@
-               if exists $detected_entry->{i2c_sub_addrs};
-      if ($detected_entry->{i2c_devnr} == $datahash->{i2c_devnr} and
- \@entry_addrs, \@hash_addrs
+(\@entry_addrs, \@hash_addrs)
-        if ($detected_entry->{conf} >= $datahash->{conf}) {
-          $put_in_detected = 0;
@@ -2952 +2952 @@
-             if exists $detected_ref->[$i]->{i2c_sub_addrs};
-        if ($detected_ref->[$i]->{i2c_devnr} == $datahash->{i2c_devnr} and
- \@entry_addrs, \@hash_addrs
+(\@entry_addrs, \@hash_addrs)
-          push @$misdetected_ref, $detected_ref->[$i]
-            unless $chipdriver eq $main_entry->{driver};
@@ -2982 +2982 @@
-
-  # First determine where the hash has to be added.
-=
+ = 
-  for ($i = 0; $i < @chips_detected; $i++) {
-    last if ($chips_detected[$i]->{driver} eq $chipdriver);
@@ -3009 +3009 @@
-        print("Can't open $dev_i2c$new_misdetected_ref->[$i]->{i2c_devnr}?!?\n"),
-        next;
- FILE
- \*FILE, $new_misdetected_ref->[$i]->{i2c_addr}
+(FILE)
+(\*FILE, $new_misdetected_ref->[$i]->{i2c_addr})
-           print("Can't set I2C address for ",
-                 "$dev_i2c$new_misdetected_ref->[$i]->{i2c_devnr}?!?\n"),
@@ -3031 +3031 @@
-        print("Can't open $dev_i2c$new_detected_ref->[$i]->{i2c_devnr}?!?\n"),
-        next;
- FILE
- \*FILE, $new_detected_ref->[$i]->{i2c_addr}
+(FILE)
+(\*FILE, $new_detected_ref->[$i]->{i2c_addr})
-           print("Can't set I2C address for ",
-                 "$dev_i2c$new_detected_ref->[$i]->{i2c_devnr}?!?\n"),
@@ -3040 +3040 @@
-        $new_detected_ref->[$i]->{isa_addr} = $datahash->{isa_addr};
-        ($datahash) = splice (@$new_detected_ref, $i, 1);
-=
+ = 
-        last;
-      }
@@ -3123 +3123 @@
-  open(local *FILE, "$dev_i2c$adapter_nr") or
-    (print "Can't open $dev_i2c$adapter_nr\n"), return;
- FILE
+(FILE)
-
-  # Can we probe this adapter?
@@ -3198 +3198 @@
-    $| = 1;
-    foreach $chip (@chip_ids) {
- $addr, @{$chip->{i2c_addrs}}
+($addr, @{$chip->{i2c_addrs}})
-        printf("\%-60s", sprintf("Probing for `\%s'... ", $chip->{name}));
-        if (($conf, @chips) = &{$chip->{i2c_detect}} (\*FILE, $addr)) {
@@ -3231 +3231 @@
-            $new_hash->{i2c_sub_addrs} = \@chips_copy;
-          }
- $chip->{driver}, $new_hash
+($chip->{driver}, $new_hash)
-        } else {
-          print "No\n";
@@ -3258 +3258 @@
-                       chipname => $chip->{name}
-                     };
- 
-
+(
+)
-      if ($new_hash) {
-        printf "    Alias of the chip on I2C bus `%s', address 0x%04x\n",
@@ -3378 +3378 @@
-                   chipname => $chip->{name}
-                 };
- 
-
+(
+)
-}
-
@@ -3536 +3536 @@
-{
-  my ($file, $addr) = @_;
-(i2c_smbus_read_byte_data($file, 0x58)
+i2c_smbus_read_byte_data($file, 0x58
-  return (8);
-}
@@ -3568 +3568 @@
-{
-  my ($chip, $addr) = @_;
- 
- ($addr + 2) != $val or inb 
- 
+
+($addr + 2) != $val or inb
+
-
-  $val = inb($addr + 5);
-  outb($addr + 5, ~$val & 0x7f);
- 
+
-    outb($addr+5, $val);
-    return;
-  }
- $addr + 5, $addr + 6, @_
+($addr + 5, $addr + 6, @_)
-  return unless (&$readproc(0x40) & 0x80) == 0x00;
-  my $reg = &$readproc(0x49);
@@ -3605 +3605 @@
-  my ($chip, $isa_addr, $file, $i2c_addr) = @_;
-  my $i;
- $isa_addr + 5, $isa_addr + 6, @_
+($isa_addr + 5, $isa_addr + 6, @_)
-  return 0 unless &$readproc(0x48) == $i2c_addr;
-  for ($i = 0x2b; $i <= 0x3d; $i ++) {
@@ -4447 +4447 @@
-{
-  my ($file, $addr) = @_;
-(i2c_smbus_read_byte_data($file, 0x3e)
+i2c_smbus_read_byte_data($file, 0x3e
-  return if (i2c_smbus_read_byte_data($file, 0x3f) & 0xfc) != 0x04;
-  return (7);
@@ -4620 +4620 @@
-  my ($chip, $isa_addr, $file, $i2c_addr) = @_;
-  my $i;
- $isa_addr + 5, $isa_addr + 6, @_
+($isa_addr + 5, $isa_addr + 6, @_)
-  return 0 unless &$readproc(0x48) == $i2c_addr;
-  for ($i = 0x2b; $i <= 0x3d; $i ++) {
@@ -4635 +4635 @@
-  my ($chip, $addr) = @_;
-  my ($reg1, $reg2);
- 
- ($addr + 2) != $val or inb 
- 
+
+($addr + 2) != $val or inb
+
-
-  $val = inb($addr + 5);
-  outb($addr+5, ~$val & 0x7f);
- 
+
-    outb($addr+5, $val);
-    return;
-  }
-
- $addr + 5, $addr + 6, @_
+($addr + 5, $addr + 6, @_)
-  $reg1 = &$read_proc(0x4e);
-  $reg2 = &$read_proc(0x4f);
@@ -4896 +4896 @@
-    # Low limits over high limits
-    if ($chip != 5) { # LM84 doesn't have low limits
--=
--=
+ -= 
+ -= 
-      return if ($llo > $lhi) or ($rlo > $rhi);
-    }
@@ -5008 +5008 @@
-  my ($chip, $isa_addr, $file, $i2c_addr) = @_;
-  my $i;
- $isa_addr + 5, $isa_addr + 6, @_
+($isa_addr + 5, $isa_addr + 6, @_)
-  return 0 unless &$readproc(0x48) == $i2c_addr;
-  for ($i = 0x30; $i <= 0x45; $i++) {
@@ -5346 +5346 @@
-sub ipmi_kcs_detect
-{
- 
+
-  return (4);
-}
@@ -5352 +5352 @@
-sub ipmi_smic_detect
-{
- 
+
-  return (4);
-}
@@ -5642 +5642 @@
-      }
-      if (exists $detection->{isa_addr}) {
-=
+ = 
-      }
-      if ($chip->{driver} eq "bmcsensors" ||
@@ -5693 +5693 @@
-         }
-       }
- INPUTFILE
+(INPUTFILE)
-       #check return value from modprobe in case modprobe -l isn't supported
-       if ((($? >> 8) == 0) && ! $modulefound) {
@@ -5727 +5727 @@
-    $configfile = "# hwmon module options\n" unless defined $configfile;
-    $configfile .= "options $chip->{driver}";
- 
-
+(
+)
-                  if @optionlist;
- ",%d,0x%02x", shift @optionlist, shift @optionlist
+(",%d,0x%02x", shift @optionlist, shift @optionlist)
-                  while @optionlist;
- 
-
+(
+)
-                  if @probelist;
- ",%d,0x%02x", shift @probelist, shift @probelist
+(",%d,0x%02x", shift @probelist, shift @probelist)
-                  while @probelist;
-    $configfile .= "\n";
@@ -5760 +5760 @@
-
-  initialize_kernel_version();
-
-
-
+()
+()
+()
-  # make sure any special case chips are added to the chip_ids list before
-  # making the support modules list
-  chip_special_cases();
-
+()
-  initialize_cpu_list();
-
@@ -5782 +5782 @@
-  print "We can start with probing for (PCI) I2C or SMBus adapters.\n";
-  print "Do you want to probe now? (YES/no): ";
-
+()
-                        if ($did_adapter_detection = not <STDIN> =~ /\s*[Nn]/);
-  print "\n";
@@ -5798 +5798 @@
-        print "Load `$adapter' (say NO if built into your kernel)? (YES/no): ";
-        unless (<STDIN> =~ /^\s*[Nn]/) {
- 
+
-            print "Loading failed... skipping.\n";
-          } else {
@@ -5820 +5820 @@
-    if (<STDIN> =~ /^\s*n/i) {
-      print "Well, you will know best.\n";
- "modprobe", "i2c-dev"
+("modprobe", "i2c-dev")
-      print "Loading failed, expect problems later on.\n";
-    } else {
@@ -5853 +5853 @@
-            "Addresses: ";
-      $inp2 = <STDIN>;
- $inp2
+($inp2)
-      @not_to_scan = parse_not_to_scan(0x03, 0x77, $inp2);
-    }
- 
-  
+(
+)
-  }
-  print "\n";
@@ -5930 +5930 @@
-    if (@{$chip->{detected}}) {
-      print "  Detects correctly:\n";
- $chip->{detected}
+($chip->{detected})
-    }
-    if (@{$chip->{misdetected}}) {
-      print "  Misdetects:\n";
- $chip->{misdetected}
+($chip->{misdetected})
-    }
-  }
@@ -5949 +5949 @@
-    if (($have_modprobe_d and not m/^\s*n/i) or m/^\s*y/i) {
-      unless ($have_modprobe_d) {
- '/etc/modprobe.d', 0777
+('/etc/modprobe.d', 0777)
-          or die "Sorry, can't create /etc/modprobe.d ($!)";
-      }
@@ -5974 +5974 @@
-  if (($have_sysconfig and not m/^\s*n/i) or m/^\s*y/i) {
-    unless ($have_sysconfig) {
- '/etc/sysconfig', 0777
+('/etc/sysconfig', 0777)
-        or die "Sorry, can't create /etc/sysconfig ($!)";
-    }