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

Timestamp:

03/16/08 19:04:20 (4 years ago)

Author:

khali

Message:

Drop broken I2C block read support.

Files:

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

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

@@ -40 +40 @@
     of Intel's '810' and other chipsets.
     See the doc/busses/i2c-i801 file for details.
-    I2C Block Read supported for ICH5 and higher.
+    I2C Block Read not supported.
     Block Process Call are not supported.
 */
@@ -146 +146 @@
 #define I801_PROC_CALL          0x10    /* later chips only, unimplemented */
 #define I801_BLOCK_DATA         0x14
-#define I801_I2C_BLOCK_DATA     0x18    /* ich4 and later */
+#define I801_I2C_BLOCK_DATA     0x18    /* unimplemented */
 #define I801_BLOCK_LAST         0x34
 #define I801_I2C_BLOCK_LAST     0x38    /* unimplemented */
@@ -166 +166 @@
 static struct pci_dev *I801_dev;
 static int isich4;      /* is PEC supported? */
-static int isich5;      /* is i2c block read supported? */
 
 static int __devinit i801_setup(struct pci_dev *dev)
@@ -185 +184 @@
         else
                 isich4 = 0;
-        isich5 = isich4 && dev->device != PCI_DEVICE_ID_INTEL_82801DB_3;
 
         /* Determine the address of the SMBus area */
@@ -326 +324 @@
                         pci_write_config_byte(I801_dev, SMBHSTCFG,
                                               hostc | SMBHSTCFG_I2C_EN);
-                } else if (!isich5) {
+                } else {
                         dev_err(I801_dev,
                                 "I2C_SMBUS_I2C_BLOCK_READ unsupported!\n");
@@ -348 +346 @@
                 if (i == len && read_write == I2C_SMBUS_READ)
                         smbcmd = I801_BLOCK_LAST;
-                else if (command == I2C_SMBUS_I2C_BLOCK_DATA &&
-                         read_write == I2C_SMBUS_READ)
-                        smbcmd = I801_I2C_BLOCK_DATA;
                 else
                         smbcmd = I801_BLOCK_DATA;
@@ -419 +414 @@
 
                 if (i == 1 && read_write == I2C_SMBUS_READ) {
-                        if (command != I2C_SMBUS_I2C_BLOCK_DATA) {
-                                len = inb_p(SMBHSTDAT0);
-                                if (len < 1)
-                                        len = 1;
-                                if (len > I2C_SMBUS_BLOCK_MAX)
-                                        len = I2C_SMBUS_BLOCK_MAX;
-                                data->block[0] = len;
-                        } else {
-                                /* if slave returns < 32 bytes transaction will fail */
-                                data->block[0] = 32;
-                        }
+                        len = inb_p(SMBHSTDAT0);
+                        if (len < 1)
+                                len = 1;
+                        if (len > I2C_SMBUS_BLOCK_MAX)
+                                len = I2C_SMBUS_BLOCK_MAX;
+                        data->block[0] = len;
                 }
 
@@ -592 +582 @@
              | (isich4 ? I2C_FUNC_SMBUS_HWPEC_CALC : 0)
 #endif
-#if 0
-             | (isich5 ? I2C_FUNC_SMBUS_READ_I2C_BLOCK
-                       : 0)
-#endif
             ;
 }