Changeset 718

Timestamp:

01/30/00 02:24:37 (13 years ago)

Author:

mds

Message:

(mds) updated adapter name to add Banshee and remove 0000 address.

Add warning if > 1 voodoo3/banshee found.

Files:

• lm-sensors/trunk/kernel/busses/i2c-voodoo3.c (modified) (7 diffs)

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

@@ -24 +24 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
-
-#define DEBUG 1
 
 /* This interfaces to the I2C bus of the Voodoo3 to gain access to
@@ -144 +142 @@
 
 static int __initdata voodoo3_initialized;
-static unsigned short voodoo3_smba = 0;
 static unsigned int state = 0xcffc0020;
 static unsigned char *mem;
@@ -739 +736 @@
 }
 
-
-
-/* Detect whether a Voodoo3 can be found, and initialize it, where necessary.
+/* Detect whether a Voodoo3 or a Banshee can be found,
+   and initialize it, where necessary.
    Note the differences between kernels with the old PCI BIOS interface and
    newer kernels with the real PCI interface. In compat.h some things are
@@ -775 +771 @@
         if (v3_num > 0) {
                 printk(KERN_INFO
-                       "i2c-voodoo3: %d Banshee/Voodoo3(s) found.\n",
-                       v3_num);
+                       "i2c-voodoo3: %d Banshee/Voodoo3 found.\n", v3_num);
+                if (v3_num > 1)
+                        printk(KERN_INFO
+                               "i2c-voodoo3: warning: only 1 supported.\n");
                 return 0;
         } else {
@@ -961 +959 @@
         }
         voodoo3_initialized++;
-        sprintf(voodoo3_i2c_adapter.name, "SMBus Voodoo3 adapter at %04x",
-                voodoo3_smba);
+        sprintf(voodoo3_i2c_adapter.name, "SMBus Voodoo3/Banshee adapter");
         if ((res = i2c_add_adapter(&voodoo3_i2c_adapter))) {
                 printk
@@ -970 +967 @@
         }
         voodoo3_initialized++;
-        sprintf(voodoo3_ddc_adapter.name, "DDC Voodoo3 adapter at %04x",
-                voodoo3_smba);
+        sprintf(voodoo3_ddc_adapter.name, "DDC Voodoo3/Banshee adapter");
         if ((res = i2c_add_adapter(&voodoo3_ddc_adapter))) {
                 printk
@@ -980 +976 @@
         voodoo3_initialized++;
         printk
-            ("i2c-voodoo3.o: Voodoo3 I2C and DDC busses detected and initialized\n");
+            ("i2c-voodoo3.o: Voodoo3/Banshee I2C and DDC busses detected and initialized\n");
         return 0;
 }