mir/lm-sensors
2
0
Fork 0
mirror of https://github.com/lm-sensors/lm-sensors synced 2025-09-02 23:35:57 +00:00
Code Issues Releases Wiki Activity

Simplify the generation of module options.

Browse Source 
git-svn-id: http://lm-sensors.org/svn/lm-sensors/branches/lm-sensors-3.0.0@5491 7894878c-1315-0410-8ee3-d5d059ff63e0
This commit is contained in:
Jean Delvare
2008-12-01 15:35:10 +00:00
parent 55abb4ac8f
commit 165fe5ce9c
1 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
prog/detect/sensors-detect
View File

@@ -4794,7 +4794,7 @@ sub print_chips_report
sub generate_modprobes sub generate_modprobes
{ {
my ($chip, $detection, @optionlist, $adap); my ($chip, $detection, $adap);
my ($isa, $ipmi); my ($isa, $ipmi);
my ($modprobes, $configfile); my ($modprobes, $configfile);
@@ -4820,27 +4820,22 @@ sub generate_modprobes
# directly, so module options are no longer needed. # directly, so module options are no longer needed.
unless (kernel_version_at_least(2, 6, 28)) { unless (kernel_version_at_least(2, 6, 28)) {
foreach $chip (@chips_detected) { foreach $chip (@chips_detected) {
@optionlist = (); my @optionlist = ();
foreach $detection (@{$chip->{detected}}) { foreach $detection (@{$chip->{detected}}) {
if (exists $detection->{i2c_addr} and next unless exists $detection->{i2c_addr}
exists $detection->{isa_addr} and && exists $detection->{isa_addr}
$i2c_adapters[$detection->{i2c_devnr}]->{used}) { && $i2c_adapters[$detection->{i2c_devnr}]->{used};
push @optionlist,
$detection->{i2c_devnr}, push @optionlist, sprintf("%d,0x%02x",
$detection->{i2c_addr}; $detection->{i2c_devnr},
} $detection->{i2c_addr});
} }
next if not @optionlist; next if not @optionlist;
$configfile = "# hwmon module options\n" $configfile = "# hwmon module options\n"
unless defined $configfile; unless defined $configfile;
$configfile .= "options $chip->{driver}"; $configfile .= "options $chip->{driver} ignore=".
$configfile .= sprintf(" ignore=%d,0x%02x", (join ",", @optionlist)."\n";
shift @optionlist,
shift @optionlist);
$configfile .= sprintf(",%d,0x%02x", shift @optionlist,
shift @optionlist) while @optionlist;
$configfile .= "\n";
} }
} }