Changeset 3177 for lm-sensors/trunk/kernel/busses/i2c-i801.c

Timestamp:

11/05/05 18:11:47 (8 years ago)

Author:

khali

Message:

Backport SMBus PEC support rewrite from Linux 2.6:

The new SMBus PEC implementation doesn't support PEC emulation on
non-PEC non-I2C SMBus masters, so we can drop all related code.

Files:

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

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

@@ -146 +146 @@
 
 static int i801_transaction(void);
-static int i801_block_transaction(union i2c_smbus_data *data,
-                                  char read_write, int command);
+static int i801_block_transaction(union i2c_smbus_data *data, char read_write,
+                                  int command, int hwpec);
 
 static unsigned short i801_smba;
@@ -299 +299 @@
 /* All-inclusive block transaction function */
 static int i801_block_transaction(union i2c_smbus_data *data, char read_write,
-                                  int command)
+                                  int command, int hwpec)
 {
         int i, len;
@@ -447 +447 @@
 
 #ifdef HAVE_PEC
-        if(isich4 && command == I2C_SMBUS_BLOCK_DATA_PEC) {
+        if (hwpec && command == I2C_SMBUS_BLOCK_DATA) {
                 /* wait for INTR bit as advised by Intel */
                 timeout = 0;
@@ -519 +519 @@
         case I2C_SMBUS_BLOCK_DATA:
         case I2C_SMBUS_I2C_BLOCK_DATA:
-#ifdef HAVE_PEC
-        case I2C_SMBUS_BLOCK_DATA_PEC:
-                if(hwpec && size == I2C_SMBUS_BLOCK_DATA)
-                        size = I2C_SMBUS_BLOCK_DATA_PEC;
-#endif
                 outb_p(((addr & 0x7f) << 1) | (read_write & 0x01),
                        SMBHSTADD);
@@ -543 +538 @@
 #endif
         if(block)
-                ret = i801_block_transaction(data, read_write, size);
+                ret = i801_block_transaction(data, read_write, size, hwpec);
         else {
                 outb_p(xact | ENABLE_INT9, SMBHSTCNT);