Changeset 3072

Timestamp:

09/07/05 22:16:18 (8 years ago)

Author:

khali

Message:

Remove dead code. Backport from a 2.6 kernel patch by
Hans-Frieder Vogt.

Files:

• lm-sensors/trunk/kernel/busses/i2c-nforce2.c (modified) (5 diffs)

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

@@ -120 +120 @@
 
 
-/* Other settings */
-#define MAX_TIMEOUT 256
-
-
-
 static s32 nforce2_access(struct i2c_adapter *adap, u16 addr,
                        unsigned short flags, char read_write,
@@ -150 +145 @@
         unsigned char protocol, pec, temp;
         unsigned char len = 0; /* to keep the compiler quiet */
-        int timeout = 0;
         int i;
 
@@ -209 +203 @@
                         printk(KERN_WARNING "i2c-nforce2.o: I2C_SMBUS_PROC_CALL not supported!\n");
                         return -1;
-                        /*
-                        outb_p(command, NVIDIA_SMB_CMD);
-                        outb_p(data->word, NVIDIA_SMB_DATA);
-                        outb_p(data->word >> 8, NVIDIA_SMB_DATA + 1);
-                        protocol = NVIDIA_SMB_PRTCL_PROC_CALL | pec;
-                        read_write = I2C_SMBUS_READ;
-                        break;
-                         */
 
                 case I2C_SMBUS_BLOCK_PROC_CALL:
                         printk(KERN_WARNING "i2c-nforce2.o: I2C_SMBUS_BLOCK_PROC_CALL not supported!\n");
                         return -1;
-                        /*
-                        protocol |= pec;
-                        len = min_t(u8, data->block[0], 31);
-                        outb_p(command, NVIDIA_SMB_CMD);
-                        outb_p(len, NVIDIA_SMB_BCNT);
-                        for (i = 0; i < len; i++)
-                                outb_p(data->block[i + 1], NVIDIA_SMB_DATA + i);
-                        protocol = NVIDIA_SMB_PRTCL_BLOCK_PROC_CALL | pec;
-                        read_write = I2C_SMBUS_READ;
-                        break;
-                        */
 
                 case I2C_SMBUS_WORD_DATA_PEC:
@@ -250 +225 @@
         temp = inb_p(NVIDIA_SMB_STS);
 
-#if 0
-        do {
-                i2c_delay(1);
-                temp = inb_p(NVIDIA_SMB_STS);
-        } while (((temp & NVIDIA_SMB_STS_DONE) == 0) && (timeout++ < MAX_TIMEOUT));
-#endif
         if (~temp & NVIDIA_SMB_STS_DONE) {
                 udelay(500);
@@ -265 +234 @@
         }
 
-        if ((timeout >= MAX_TIMEOUT) || (~temp & NVIDIA_SMB_STS_DONE) || (temp & NVIDIA_SMB_STS_STATUS))
+        if ((~temp & NVIDIA_SMB_STS_DONE) || (temp & NVIDIA_SMB_STS_STATUS)) {
+                printk(KERN_DEBUG "i2c-nforce2.o: SMBus Timeout! (0x%02x)\n",
+                       temp);
                 return -1;
+        }
 
         if (read_write == I2C_SMBUS_WRITE)