Changeset 1011

Timestamp:

02/03/01 21:48:43 (12 years ago)

Author:

mds

Message:

PCI chip detection cleanup.

Location:

lm-sensors/trunk

Files:

• CHANGES (modified) (1 diff)
• kernel/busses/i2c-i801.c (modified) (4 diffs)

lm-sensors/trunk/CHANGES

@@ -22 +22 @@
   File doc/chips/via686a: Claim support for 686b.
   File sensors.conf.eg: Adjust as99127f -12V calculation
+  Module i2c-i801: Chip detection cleanup
   Module lm78: Recognize chipid=0x20
   Module lm87: Fix in0, in1 (2.5V and Vccp1) calculations

lm-sensors/trunk/kernel/busses/i2c-i801.c

@@ -2 +2 @@
     i801.c - Part of lm_sensors, Linux kernel modules for hardware
               monitoring
-    Copyright (c) 1998, 1999  Frodo Looijaard <frodol@dds.nl>,
+    Copyright (c) 1998 - 2001  Frodo Looijaard <frodol@dds.nl>,
     Philip Edelbrock <phil@netroedge.com>, and Mark D. Studebaker
     <mdsxyz123@yahoo.com>
@@ -51 +51 @@
 #define PCI_DEVICE_ID_INTEL_82801BA_3   0x2443
 #endif
+
+static int supported[] = {PCI_DEVICE_ID_INTEL_82801AA_3,
+                          PCI_DEVICE_ID_INTEL_82801AB_3,
+                          PCI_DEVICE_ID_INTEL_82801BA_3,
+                          0 };
 
 /* I801 SMBus address offsets */
@@ -159 +164 @@
 {
         int error_return = 0;
+        int *num = supported;
         unsigned char temp;
 
@@ -168 +174 @@
         }
 
-        /* Look for the I801, function 3 */
-        /* Have to check for both the 82801AA and 82801AB */
+        /* Look for each chip */
         /* Note: we keep on searching until we have found 'function 3' */
         I801_dev = NULL;
-        do
-                I801_dev = pci_find_device(PCI_VENDOR_ID_INTEL,
-                                           PCI_DEVICE_ID_INTEL_82801AA_3,
-                                           I801_dev);
-        while (I801_dev && (PCI_FUNC(I801_dev->devfn) != 3));
-        if (I801_dev == NULL) {
-                do
-                        I801_dev = pci_find_device(PCI_VENDOR_ID_INTEL,
-                                           PCI_DEVICE_ID_INTEL_82801AB_3,
-                                           I801_dev);
-                while (I801_dev && (PCI_FUNC(I801_dev->devfn) != 3));
-        }
-        if (I801_dev == NULL) {
-                do
-                        I801_dev = pci_find_device(PCI_VENDOR_ID_INTEL,
-                                           PCI_DEVICE_ID_INTEL_82801BA_3,
-                                           I801_dev);
-                while (I801_dev && (PCI_FUNC(I801_dev->devfn) != 3));
-        }
+        do {
+                if((I801_dev = pci_find_device(PCI_VENDOR_ID_INTEL,
+                                              *num, I801_dev))) {
+                        if(PCI_FUNC(I801_dev->devfn) != 3)
+                                continue;
+                        break;
+                }
+                num++;
+        } while (*num != 0);
+
         if (I801_dev == NULL) {
                 printk