From b967ed740b9bd4f5079bb8c60e6967b072945059 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Sun, 20 Nov 2005 19:25:28 +0000 Subject: [PATCH] Remove dead code in PCI adapter detection loop. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@3198 7894878c-1315-0410-8ee3-d5d059ff63e0 --- prog/detect/sensors-detect | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect index 55bd8545..b9a2e23c 100755 --- a/prog/detect/sensors-detect +++ b/prog/detect/sensors-detect @@ -2169,15 +2169,11 @@ sub adapter_pci_detection # Generic detection loop while ( ($key, $device) = each %pci_list) { foreach $try (@pci_adapters) { - if ((defined($device->{vendid}) and - $try->{vendid} == $device->{vendid} and - $try->{devid} == $device->{devid} and - $try->{func} == $device->{func}) or - (! defined($device->{vendid}) and - $device->{desc} =~ /$try->{procid}/ and - $try->{func} == $device->{func})) { + if ($try->{vendid} == $device->{vendid} && + $try->{devid} == $device->{devid} && + $try->{func} == $device->{func}) { printf "Use driver `%s' for device %02x:%02x.%x: %s\n", - $try->{driver}?$try->{driver}:"", + $try->{driver}, $device->{bus},$device->{slot},$device->{func},$try->{procid}; push @res,$try->{driver}; }